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 B192261AE9 for ; Thu, 10 Feb 2022 11:58:49 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A91E41BDA0 for ; Thu, 10 Feb 2022 11:58:19 +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 68AAF1BD97 for ; Thu, 10 Feb 2022 11:58:18 +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 41676419B7 for ; Thu, 10 Feb 2022 11:58:18 +0100 (CET) Date: Thu, 10 Feb 2022 11:58:10 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20220204184538.3139247-1-s.ivanov@proxmox.com> <20220204184538.3139247-4-s.ivanov@proxmox.com> In-Reply-To: <<20220204184538.3139247-4-s.ivanov@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1644490214.lr75aj1rik.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.195 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com, multi-user.target] Subject: Re: [pve-devel] [PATCH pve-kernel-meta v2 3/4] 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: Thu, 10 Feb 2022 10:58:49 -0000 On February 4, 2022 7:45 pm, Stoiko Ivanov wrote: > by setting the desired version in a dedicated file, which is used > by the systemd service as condition for removing it and refreshing > upon reboot >=20 > Signed-off-by: Stoiko Ivanov > --- > bin/proxmox-boot-tool | 34 +++++++++++++++++------ > debian/pve-kernel-helper.install | 1 + > debian/rules | 3 ++ > proxmox-boot/Makefile | 4 +++ > proxmox-boot/functions | 3 ++ > proxmox-boot/proxmox-boot-cleanup.service | 13 +++++++++ > proxmox-boot/zz-proxmox-boot | 3 ++ > 7 files changed, 53 insertions(+), 8 deletions(-) > create mode 100644 proxmox-boot/proxmox-boot-cleanup.service >=20 > diff --git a/bin/proxmox-boot-tool b/bin/proxmox-boot-tool > index 31342a6..5d878f6 100755 > --- a/bin/proxmox-boot-tool > +++ b/bin/proxmox-boot-tool > @@ -299,8 +299,9 @@ usage() { > warn " $0 init " > warn " $0 clean [--dry-run]" > warn " $0 refresh [--hook ]" > - warn " $0 kernel " > - warn " $0 kernel " > + warn " $0 kernel " > + warn " $0 kernel list" > + warn " $0 kernel unpin [--next-boot]" > warn " $0 status [--quiet]" > warn " $0 help" > } > @@ -322,16 +323,20 @@ help() { > echo "" > echo " refresh all configured EFI system partitions. Use --hook to o= nly 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 sy= nced kernels, in addition to automatically selected ones." > echo " pin pve-kernel with ABI sets it as the defau= lt entry to be booted." > + echo " next-boot pve-kernel with ABI sets the kerne= l version for the next boot." > echo " NOTE: you need to manually run 'refresh' once you're finished= with adding/removing/pinning kernels from the list" > echo "" > - echo "USAGE: $0 kernel " > + echo "USAGE: $0 kernel list" > echo "" > echo " list kernel versions currently selected for inclusion on ESPs= ." > - echo " unpin sets the latest kernel as the default entry (undoes a p= revious pin)" > + echo "" > + echo "USAGE: $0 kernel unpin [--next-boot]" > + echo "" > + echo " unpin removes pinned and next-boot kernel settings. Use --nex= t-boot to only remove a next-boot setting." > echo "" > echo "USAGE: $0 status [--quiet]" > echo "" > @@ -400,6 +405,7 @@ status() { > =20 > pin_kernel() { > ver=3D"$1" > + pin_file=3D"$2" > =20 > if [ -z "$ver" ]; then > warn "E: is mandatory" > @@ -407,17 +413,25 @@ pin_kernel() { > exit 1 > fi > =20 > + if [ -z "$pin_file" ]; then > + pin_file=3D"$PINNED_KERNEL_CONF" > + fi > + > if [ ! -e "/boot/vmlinuz-$ver" ]; then > warn "E: no kernel image found in /boot for '$ver', not setting defaul= t." > exit 1 > fi > - echo "$ver" > "$PINNED_KERNEL_CONF" > + echo "$ver" > "$pin_file" > echo "Set kernel '$ver' $PINNED_KERNEL_CONF. Use the 'refresh' command = to update the ESPs." this message is now wrong? > } > =20 > unpin_kernel() { > - rm -f "$PINNED_KERNEL_CONF" > - echo "Removed $PINNED_KERNEL_CONF. Use the 'refresh' command to update = the ESPs." > + rm -f "$NEXT_BOOT_PIN" > + echo "Removed $NEXT_BOOT_PIN. Use the 'refresh' command to update the E= SPs." > + if [ -z "$1" ]; then $1 has never been checked to be '--next-boot', so this can easily be=20 misused (e.g., someone not reading the docs thinking 'kernel unpin $foo'=20 is the reverse of 'kernel pin $foo'). might warrant a check below? > + rm -f "$PINNED_KERNEL_CONF" > + echo "Removed $PINNED_KERNEL_CONF. Use the 'refresh' command to update= the ESPs." > + fi > } > =20 > if [ -z "$1" ]; then > @@ -496,6 +510,10 @@ case "$1" in > unpin_kernel "$2" here ^ > exit 0 > ;; > + 'next-boot') > + pin_kernel "$2" "${NEXT_BOOT_PIN}" > + 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 $@ > =20 > +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 =3D proxmox-auto-removal zz-proxmox-= boot > INITRAMFS_HOOKSCRIPTS =3D proxmox-boot-sync > SHARE_FILES =3D functions > GRUB_CFG_SNIPPET =3D 000_proxmox_boot_header > +SYSTEMD_SERVICES =3D proxmox-boot-cleanup.service > =20 > POSTINSTHOOKDIR =3D ${DESTDIR}/etc/kernel/postinst.d > POSTRMHOOKDIR =3D ${DESTDIR}/etc/kernel/postrm.d > POSTINITRAMFSHOOKDIR =3D ${DESTDIR}/etc/initramfs/post-update.d > SHARE_SCRIPTDIR =3D ${DESTDIR}/usr/share/pve-kernel-helper/scripts > GRUB_CFG_DIR =3D ${DESTDIR}/etc/grub.d > +SERVICE_DIR =3D ${DESTDIR}/lib/systemd/system > =20 > .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} > =20 > .PHONY: clean distclean > distclean: > diff --git a/proxmox-boot/functions b/proxmox-boot/functions > index d97a7a1..b1a10a5 100755 > --- a/proxmox-boot/functions > +++ b/proxmox-boot/functions > @@ -6,6 +6,7 @@ ESPTYPE=3D'c12a7328-f81f-11d2-ba4b-00a0c93ec93b' > =20 > MANUAL_KERNEL_LIST=3D"/etc/kernel/pve-efiboot-manual-kernels" > PINNED_KERNEL_CONF=3D"/etc/kernel/proxmox-boot-pin" > +NEXT_BOOT_PIN=3D"/etc/kernel/next-boot-pin" > =20 > MOUNTROOT=3D"${TMPDIR:-/var/tmp}/espmounts" > # relative to the ESP mountpoint > @@ -60,6 +61,7 @@ kernel_keep_versions() { > fi > =20 > pinned_kernel=3D"$(get_first_line "$PINNED_KERNEL_CONF")" > + nextboot_kernel=3D"$(get_first_line "$NEXT_BOOT_PIN")" > =20 > kernels=3D"$(cat <<-EOF > $running_version > @@ -69,6 +71,7 @@ kernel_keep_versions() { > $series_metapackages > $oldseries_latest_kernel > $pinned_kernel > + $nextboot_kernel > EOF > )" > =20 > diff --git a/proxmox-boot/proxmox-boot-cleanup.service b/proxmox-boot/pro= xmox-boot-cleanup.service > new file mode 100644 > index 0000000..4f9da94 > --- /dev/null > +++ b/proxmox-boot/proxmox-boot-cleanup.service > @@ -0,0 +1,13 @@ > +[Unit] > +Description=3DClean up bootloader next-boot setting > +After=3Dsystemd-remount-fs.service > +ConditionPathExists=3D/etc/kernel/next-boot-pin > + > +[Service] > +Type=3Doneshot > +RemainAfterExit=3Dyes > +ExecStart=3D/usr/sbin/proxmox-boot-tool kernel unpin --next-boot > +ExecStart=3D/usr/sbin/proxmox-boot-tool refresh > + > +[Install] > +WantedBy=3Dmulti-user.target > diff --git a/proxmox-boot/zz-proxmox-boot b/proxmox-boot/zz-proxmox-boot > index 7958a5d..5fe16a6 100755 > --- a/proxmox-boot/zz-proxmox-boot > +++ b/proxmox-boot/zz-proxmox-boot > @@ -93,6 +93,9 @@ update_esp_func() { > =20 > pinned_kernel=3D$(get_first_line "${PINNED_KERNEL_CONF}") > =20 > + if [ -e "${NEXT_BOOT_PIN}" ]; then > + pinned_kernel=3D$(get_first_line "${NEXT_BOOT_PIN}") > + fi > if [ -d /sys/firmware/efi ]; then > set_systemd_boot_default "${mountpoint}" "${pinned_kernel}" > remove_old_kernels_efi "${mountpoint}" > --=20 > 2.30.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20