diff --git a/bin/grub-install-wrapper b/bin/grub-install-wrapper index 69bd878..90ccdc0 100755 --- a/bin/grub-install-wrapper +++ b/bin/grub-install-wrapper @@ -2,7 +2,7 @@ set -e -. /usr/share/pve-kernel-helper/scripts/functions +. /usr/share/proxmox-kernel-helper/scripts/functions if proxmox-boot-tool status --quiet; then # detect when being called by dpkg (e.g. grub-pc.postinst diff --git a/bin/proxmox-boot-tool b/bin/proxmox-boot-tool index 49c63ba..d41f921 100755 --- a/bin/proxmox-boot-tool +++ b/bin/proxmox-boot-tool @@ -2,7 +2,7 @@ set -e -. /usr/share/pve-kernel-helper/scripts/functions +. /usr/share/proxmox-kernel-helper/scripts/functions _add_entry_to_list_file() { file="$1" diff --git a/debian/install b/debian/install index 95461b1..f3182a3 100644 --- a/debian/install +++ b/debian/install @@ -5,5 +5,5 @@ etc/initramfs/post-update.d/proxmox-boot-sync lib/systemd/system/proxmox-boot-cleanup.service usr/sbin/proxmox-boot-tool usr/sbin/grub-install -usr/share/pve-kernel-helper/scripts/functions +usr/share/proxmox-kernel-helper/scripts/functions debian/proxmox-simpledrm /usr/share/initramfs-tools/modules.d diff --git a/debian/links b/debian/links index 70bf372..5f907f9 100644 --- a/debian/links +++ b/debian/links @@ -1 +1,3 @@ /usr/sbin/proxmox-boot-tool /usr/sbin/pve-efiboot-tool +# for upgrade compat, can be removed with 8.0 +/usr/share/proxmox-kernel-helper /usr/share/pve-kernel-helper diff --git a/proxmox-boot/000_proxmox_boot_header b/proxmox-boot/000_proxmox_boot_header index 106273e..c3a48a4 100755 --- a/proxmox-boot/000_proxmox_boot_header +++ b/proxmox-boot/000_proxmox_boot_header @@ -1,7 +1,7 @@ #! /bin/sh set -e -. /usr/share/pve-kernel-helper/scripts/functions +. /usr/share/proxmox-kernel-helper/scripts/functions if proxmox-boot-tool status --quiet; then cat <<- EOF diff --git a/proxmox-boot/Makefile b/proxmox-boot/Makefile index 2b0685d..97592ce 100644 --- a/proxmox-boot/Makefile +++ b/proxmox-boot/Makefile @@ -7,7 +7,7 @@ SYSTEMD_SERVICES = proxmox-boot-cleanup.service POSTINSTHOOKDIR = ${DESTDIR}/etc/kernel/postinst.d POSTRMHOOKDIR = ${DESTDIR}/etc/kernel/postrm.d POSTINITRAMFSHOOKDIR = ${DESTDIR}/etc/initramfs/post-update.d -SHARE_SCRIPTDIR = ${DESTDIR}/usr/share/pve-kernel-helper/scripts +SHARE_SCRIPTDIR = ${DESTDIR}/usr/share/proxmox-kernel-helper/scripts GRUB_CFG_DIR = ${DESTDIR}/etc/grub.d SERVICE_DIR = ${DESTDIR}/lib/systemd/system diff --git a/proxmox-boot/proxmox-auto-removal b/proxmox-boot/proxmox-auto-removal index 7b21ec4..8fd27ce 100755 --- a/proxmox-boot/proxmox-auto-removal +++ b/proxmox-boot/proxmox-auto-removal @@ -1,7 +1,7 @@ #! /bin/sh set -e -. /usr/share/pve-kernel-helper/scripts/functions +. /usr/share/proxmox-kernel-helper/scripts/functions eval "$(apt-config shell APT_CONF_D Dir::Etc::parts/d)" test -n "${APT_CONF_D}" || APT_CONF_D="/etc/apt/apt.conf.d" diff --git a/proxmox-boot/zz-proxmox-boot b/proxmox-boot/zz-proxmox-boot index 5fe16a6..c6c708c 100755 --- a/proxmox-boot/zz-proxmox-boot +++ b/proxmox-boot/zz-proxmox-boot @@ -28,7 +28,7 @@ cleanup() { trap cleanup EXIT INT TERM QUIT -. /usr/share/pve-kernel-helper/scripts/functions +. /usr/share/proxmox-kernel-helper/scripts/functions LOADER_TITLE="Proxmox Virtual Environment" if [ -d /etc/pve/ ]; then