From patchwork Thu May 12 17:41:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5612 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KzfGb5ng0z3x1v for ; Thu, 12 May 2022 17:41:43 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KzfGY52YJz454; Thu, 12 May 2022 17:41:41 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KzfGY3sLpz2yjZ; Thu, 12 May 2022 17:41:41 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KzfGX6GKCz2yWZ for ; Thu, 12 May 2022 17:41:40 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4KzfGX0qYzzZ2 for ; Thu, 12 May 2022 17:41:39 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1652377300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g7Q4ghUf8/JXi78Bps8umUi3+8xfb2wdsmrZGL7g3nI=; b=3MHABDP3GbU/xyaKBKhnEfL+3SoZ0bO0c2ROkmaKsa4wy9wHHpSTYbiLUYRlTK7ZHHZnAw QeD28elit/HZzfCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1652377300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g7Q4ghUf8/JXi78Bps8umUi3+8xfb2wdsmrZGL7g3nI=; b=ltw71BzrX1weYP67Tyox3dZc/5NrlZbySDjS9Tiw3keoGDG8B71Oe5RSnR1mCyL7K7VQhL sXNtm76GLO9YtzvAUvpSC49OtL0tHslQ79wpkhSUjhz/3qYF46ByQLFvA/9Iflqj5PUw8n FeE6KfaqIHGPtq/21tdpqUSXLB0JF1BrzcvsaptG8j8QygTGwx7gysjqDCBcL0ytNfwl2B +P9j6G2IHNQFBn/psMuV8AIkvdCJXqydDoiMgnHj0Icz2mez73mbtC0ICIIvhQs5ViW9gU 79YIG/hxYgUfETI1Kr9QxUvaGi5eFf4/Sy/IgtcEiVKwrfsZtC8ezxukMTAvbw== Message-ID: Date: Thu, 12 May 2022 17:41:37 +0000 MIME-Version: 1.0 Content-Language: en-US To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] Core Update 168: Hard-code kernel version to 5.15.35 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" On systems that have previously running on testing, kernel 5.15.32 might still be installed. dracut being called with ${KVER} will then build an inital ramdisk for the wrong kernel, as 5.15.32 might still be running, albeit 5.15.35 has been installed due to the Pakfire procedure when upgrading on testing. Due to lack of hardware, this patch is untested on ARM. https://lists.ipfire.org/pipermail/development/2022-May/013433.html Reported-by: Stefan Schantl Signed-off-by: Peter Müller --- config/rootfiles/core/168/update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/core/168/update.sh b/config/rootfiles/core/168/update.sh index d21f648dd..7cc8800b2 100644 --- a/config/rootfiles/core/168/update.sh +++ b/config/rootfiles/core/168/update.sh @@ -107,14 +107,14 @@ chmod -v 750 /etc/sudoers.d chmod -v 640 /etc/sudoers.d/* # Rebuild initial ramdisk to apply microcode updates -dracut --regenerate-all --force +dracut --kver="5.15.35-ipfire" --regenerate-all --force case "$(uname -m)" in armv*) - mkimage -A arm -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire - rm /boot/initramfs-${KVER}-ipfire.img + mkimage -A arm -T ramdisk -C lzma -d /boot/initramfs-5.15.35-ipfire.img /boot/uInit-5.15.35-ipfire + rm /boot/initramfs-5.15.35-ipfire.img ;; aarch64) - mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire + mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-5.15.35-ipfire.img /boot/uInit-5.15.35-ipfire # dont remove initramfs because grub need this to boot. ;; esac