Re: [pve-devel] [PATCH pve-kernel-meta 4/5] proxmox-boot: add kernel next-boot command

[Aaron Lauterer <a.lauterer@proxmox.com>]

One small nit at the end:

On 1/31/22 18:59, Stoiko Ivanov wrote:
> by pinning the desired version and touching a flag file, which is used
> by the systemd service as condition for unpinning and refreshing upon
> reboot
> 
> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
> ---
>   bin/proxmox-boot-tool                     |  9 +++++++--
>   debian/pve-kernel-helper.install          |  1 +
>   debian/rules                              |  3 +++
>   proxmox-boot/Makefile                     |  4 ++++
>   proxmox-boot/functions                    |  1 +
>   proxmox-boot/proxmox-boot-cleanup.service | 15 +++++++++++++++
>   6 files changed, 31 insertions(+), 2 deletions(-)
>   create mode 100644 proxmox-boot/proxmox-boot-cleanup.service
> 
> diff --git a/bin/proxmox-boot-tool b/bin/proxmox-boot-tool
> index 75eea0e..005109a 100755
> --- a/bin/proxmox-boot-tool
> +++ b/bin/proxmox-boot-tool
> @@ -302,7 +302,7 @@ usage() {
>   	warn "       $0 init <partition>"
>   	warn "       $0 clean [--dry-run]"
>   	warn "       $0 refresh [--hook <name>]"
> -	warn "       $0 kernel <add|remove|pin> <kernel-version>"
> +	warn "       $0 kernel <add|remove|pin|next-boot> <kernel-version>"
>   	warn "       $0 kernel <list|unpin>"
>   	warn "       $0 status [--quiet]"
>   	warn "       $0 help"
> @@ -325,7 +325,7 @@ help() {
>   	echo ""
>   	echo "    refresh all configured EFI system partitions. Use --hook to only run the specified hook, omit to run all."
>   	echo ""
> -	echo "USAGE: $0 kernel <add|remove|pin> <kernel-version>"
> +	echo "USAGE: $0 kernel <add|remove|pin|next-boot> <kernel-version>"
>   	echo ""
>   	echo "    add/remove pve-kernel with ABI <kernel-version> to list of synced kernels, in addition to automatically selected ones."
>   	echo "    NOTE: you need to manually run 'refresh' once you're finished with adding/removing kernels from the list"
> @@ -499,6 +499,11 @@ case "$1" in
>   				unpin_kernel "$2"
>   				exit 0
>   			;;
> +			'next-boot')
> +				pin_kernel "$2"
> +				touch "${PMX_NEXT_BOOT_FILE}"
> +				exit 0
> +			;;
>   			*)
>   				warn "E: invalid 'kernel' subcommand '$cmd'."
>   				warn ""
> diff --git a/debian/pve-kernel-helper.install b/debian/pve-kernel-helper.install
> index 5f264aa..33170fb 100644
> --- a/debian/pve-kernel-helper.install
> +++ b/debian/pve-kernel-helper.install
> @@ -2,6 +2,7 @@ etc/grub.d/000_proxmox_boot_header
>   etc/kernel/postinst.d/*
>   etc/kernel/postrm.d/*
>   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
> diff --git a/debian/rules b/debian/rules
> index 58f7f7d..3dd1bc8 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -12,5 +12,8 @@ debian/control: $(wildcard debian/*.in)
>   %:
>   	dh $@
>   
> +override_dh_installsystemd:
> +	dh_installsystemd --no-start
> +
>   .PHONY: build clean
>   build clean:
> diff --git a/proxmox-boot/Makefile b/proxmox-boot/Makefile
> index effd726..2b0685d 100644
> --- a/proxmox-boot/Makefile
> +++ b/proxmox-boot/Makefile
> @@ -2,12 +2,14 @@ KERNEL_HOOKSCRIPTS = proxmox-auto-removal zz-proxmox-boot
>   INITRAMFS_HOOKSCRIPTS = proxmox-boot-sync
>   SHARE_FILES = functions
>   GRUB_CFG_SNIPPET = 000_proxmox_boot_header
> +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
>   GRUB_CFG_DIR = ${DESTDIR}/etc/grub.d
> +SERVICE_DIR = ${DESTDIR}/lib/systemd/system
>   
>   .PHONY: all
>   all:
> @@ -23,6 +25,8 @@ install:
>   	install -m 0755 ${SHARE_FILES} ${SHARE_SCRIPTDIR}
>   	install -d ${GRUB_CFG_DIR}
>   	install -m 0755 ${GRUB_CFG_SNIPPET} ${GRUB_CFG_DIR}
> +	install -d ${SERVICE_DIR}
> +	install -m 0644 ${SYSTEMD_SERVICES} ${SERVICE_DIR}
>   
>   .PHONY: clean distclean
>   distclean:
> diff --git a/proxmox-boot/functions b/proxmox-boot/functions
> index 9fa29ca..3bea421 100755
> --- a/proxmox-boot/functions
> +++ b/proxmox-boot/functions
> @@ -6,6 +6,7 @@ ESPTYPE='c12a7328-f81f-11d2-ba4b-00a0c93ec93b'
>   
>   MANUAL_KERNEL_LIST="/etc/kernel/pve-efiboot-manual-kernels"
>   PINNED_KERNEL_CONF="/etc/kernel/proxmox-boot-pin"
> +PMX_NEXT_BOOT_FILE="/etc/kernel/next-boot-active"
>   
>   MOUNTROOT="${TMPDIR:-/var/tmp}/espmounts"
>   # relative to the ESP mountpoint
> diff --git a/proxmox-boot/proxmox-boot-cleanup.service b/proxmox-boot/proxmox-boot-cleanup.service
> new file mode 100644
> index 0000000..3c390de
> --- /dev/null
> +++ b/proxmox-boot/proxmox-boot-cleanup.service
> @@ -0,0 +1,15 @@
> +[Unit]
> +Description=Clean up bootloader next-boot setting
> +After=systemd-remount-fs.service
> +ConditionPathExists=/etc/kernel/next-boot-active
> +
> +[Service]
> +Type=oneshot
> +RemainAfterExit=yes
> +ExecStart=/usr/sbin/proxmox-boot-tool kernel unpin
> +ExecStart=/usr/sbin/proxmox-boot-tool refresh
> +ExecStart=/bin/rm -f /etc/kernel/next-boot-active
> +
> +[Install]
> +WantedBy=multi-user.target
> +

Do we want a newline here at the end of the unit file?