Re: [pve-devel] [PATCH pve-kernel-meta 1/7] proxmox-boot-tool: rename from pve-efiboot-tool

["Fabian Grünbichler" <f.gruenbichler@proxmox.com>]

On April 22, 2021 1:17 pm, Stoiko Ivanov wrote:
> We will be using the mechanics also for ZFS systems booting with BIOS
> legacy boot, and the tool is used also in PMG and PBS.
> 
> A symlink is kept in place for compatibility reasons
> 
> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
> ---
>  Makefile                                                      | 2 +-
>  bin/Makefile                                                  | 2 +-
>  bin/{pve-efiboot-tool => proxmox-boot-tool}                   | 2 +-
>  debian/pve-kernel-helper.install                              | 4 ++--
>  debian/pve-kernel-helper.links                                | 1 +
>  {efiboot => proxmox-boot}/Makefile                            | 4 ++--
>  {efiboot => proxmox-boot}/functions                           | 0
>  efiboot/pve-auto-removal => proxmox-boot/proxmox-auto-removal | 0
>  efiboot/pve-efiboot-sync => proxmox-boot/proxmox-boot-sync    | 2 +-
>  efiboot/zz-pve-efiboot => proxmox-boot/zz-proxmox-boot        | 0
>  10 files changed, 9 insertions(+), 8 deletions(-)
>  rename bin/{pve-efiboot-tool => proxmox-boot-tool} (99%)
>  create mode 100644 debian/pve-kernel-helper.links
>  rename {efiboot => proxmox-boot}/Makefile (87%)
>  rename {efiboot => proxmox-boot}/functions (100%)
>  rename efiboot/pve-auto-removal => proxmox-boot/proxmox-auto-removal (100%)
>  rename efiboot/pve-efiboot-sync => proxmox-boot/proxmox-boot-sync (84%)
>  rename efiboot/zz-pve-efiboot => proxmox-boot/zz-proxmox-boot (100%)

these three files are installed as five conffiles, so they need special 
care when being renamed/moved, see `man dpkg-maintscript-helper`. 
alternatively we could also just unconditionally remove them on 
upgrades I guess.

otherwise the old ones will stay around on upgrades, and also be 
called..

> 
> diff --git a/Makefile b/Makefile
> index 0b62b3e..90d5989 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -13,7 +13,7 @@ BUILD_DIR=build
>  
>  DEBS=${KERNEL_DEB} ${HEADERS_DEB} ${HELPER_DEB}
>  
> -SUBDIRS = efiboot bin
> +SUBDIRS = proxmox-boot bin
>  
>  .PHONY: all
>  all: ${SUBDIRS}
> diff --git a/bin/Makefile b/bin/Makefile
> index 058c86f..b78fa42 100644
> --- a/bin/Makefile
> +++ b/bin/Makefile
> @@ -5,7 +5,7 @@ all:
>  
>  install:
>  	install -d ${SBINDIR}
> -	install -m 0755 pve-efiboot-tool ${SBINDIR}/
> +	install -m 0755 proxmox-boot-tool ${SBINDIR}/
>  
>  .PHONY: clean distclean
>  distclean:
> diff --git a/bin/pve-efiboot-tool b/bin/proxmox-boot-tool
> similarity index 99%
> rename from bin/pve-efiboot-tool
> rename to bin/proxmox-boot-tool
> index f57a752..2d625a6 100755
> --- a/bin/pve-efiboot-tool
> +++ b/bin/proxmox-boot-tool
> @@ -199,7 +199,7 @@ clean() {
>  
>  refresh() {
>  	hook=$1
> -	hookscripts='pve-auto-removal zz-pve-efiboot'
> +	hookscripts='proxmox-auto-removal zz-proxmox-boot'
>  
>  	if [ -n "$hook" ]; then
>  	    if echo "$hookscripts" | grep -sqE "(^|[[:space:]]+)$hook([[:space:]]+|$)"; then
> diff --git a/debian/pve-kernel-helper.install b/debian/pve-kernel-helper.install
> index 6f7f713..aae9494 100644
> --- a/debian/pve-kernel-helper.install
> +++ b/debian/pve-kernel-helper.install
> @@ -1,5 +1,5 @@
>  etc/kernel/postinst.d/*
>  etc/kernel/postrm.d/*
> -etc/initramfs/post-update.d/pve-efiboot-sync
> -usr/sbin/pve-efiboot-tool
> +etc/initramfs/post-update.d/proxmox-boot-sync
> +usr/sbin/proxmox-boot-tool
>  usr/share/pve-kernel-helper/scripts/functions
> diff --git a/debian/pve-kernel-helper.links b/debian/pve-kernel-helper.links
> new file mode 100644
> index 0000000..70bf372
> --- /dev/null
> +++ b/debian/pve-kernel-helper.links
> @@ -0,0 +1 @@
> +/usr/sbin/proxmox-boot-tool /usr/sbin/pve-efiboot-tool
> diff --git a/efiboot/Makefile b/proxmox-boot/Makefile
> similarity index 87%
> rename from efiboot/Makefile
> rename to proxmox-boot/Makefile
> index fc9e333..3a36cb7 100644
> --- a/efiboot/Makefile
> +++ b/proxmox-boot/Makefile
> @@ -1,5 +1,5 @@
> -KERNEL_HOOKSCRIPTS = pve-auto-removal zz-pve-efiboot
> -INITRAMFS_HOOKSCRIPTS = pve-efiboot-sync
> +KERNEL_HOOKSCRIPTS = proxmox-auto-removal zz-proxmox-boot
> +INITRAMFS_HOOKSCRIPTS = proxmox-boot-sync
>  SHARE_FILES = functions
>  
>  POSTINSTHOOKDIR = ${DESTDIR}/etc/kernel/postinst.d
> diff --git a/efiboot/functions b/proxmox-boot/functions
> similarity index 100%
> rename from efiboot/functions
> rename to proxmox-boot/functions
> diff --git a/efiboot/pve-auto-removal b/proxmox-boot/proxmox-auto-removal
> similarity index 100%
> rename from efiboot/pve-auto-removal
> rename to proxmox-boot/proxmox-auto-removal
> diff --git a/efiboot/pve-efiboot-sync b/proxmox-boot/proxmox-boot-sync
> similarity index 84%
> rename from efiboot/pve-efiboot-sync
> rename to proxmox-boot/proxmox-boot-sync
> index c3ccf8e..5bdd72e 100644
> --- a/efiboot/pve-efiboot-sync
> +++ b/proxmox-boot/proxmox-boot-sync
> @@ -7,5 +7,5 @@ set -e
>  # this variable will be set to 1 and we do nothing, since our pve-kernel
>  # hooks will update the ESPs all at once anyway.
>  if [ -z "$INITRAMFS_TOOLS_KERNEL_HOOK" ]; then
> -	/usr/sbin/pve-efiboot-tool refresh --hook 'zz-pve-efiboot'
> +	/usr/sbin/proxmox-boot-tool refresh --hook 'zz-proxmox-boot'
>  fi
> diff --git a/efiboot/zz-pve-efiboot b/proxmox-boot/zz-proxmox-boot
> similarity index 100%
> rename from efiboot/zz-pve-efiboot
> rename to proxmox-boot/zz-proxmox-boot
> -- 
> 2.20.1
> 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
> 
>