From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 58FCD65081 for ; Mon, 31 Jan 2022 18:59:41 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 48E1027238 for ; Mon, 31 Jan 2022 18:59:41 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 64FAC27219 for ; Mon, 31 Jan 2022 18:59:39 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3E1464618F for ; Mon, 31 Jan 2022 18:59:39 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Mon, 31 Jan 2022 18:59:17 +0100 Message-Id: <20220131175918.2099575-5-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220131175918.2099575-1-s.ivanov@proxmox.com> References: <20220131175918.2099575-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.260 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-kernel-meta 4/5] proxmox-boot: add kernel next-boot command X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jan 2022 17:59:41 -0000 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 --- 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 " warn " $0 clean [--dry-run]" warn " $0 refresh [--hook ]" - warn " $0 kernel " + warn " $0 kernel " warn " $0 kernel " 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 " + echo "USAGE: $0 kernel " echo "" echo " add/remove pve-kernel with ABI 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 + -- 2.30.2