From 53118d2112c2dc686a04aefc564f9e062caba33d Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Jul 29 2024 17:01:26 +0000 Subject: Backport patch to only read /proc/cmdline when not in container --- diff --git a/33864.patch b/33864.patch new file mode 100644 index 0000000..290af4c --- /dev/null +++ b/33864.patch @@ -0,0 +1,39 @@ +From 94a2999f250e3f7579883f5c79815b80398043cd Mon Sep 17 00:00:00 2001 +From: Daan De Meyer +Date: Mon, 29 Jul 2024 17:13:28 +0200 +Subject: [PATCH] kernel-install: Only read cmdline from /proc/cmdline when not + in container + +If we're running from within a container, we're very likely not going +to want to use the kernel command line from /proc/cmdline, so let's add +a check to see if we're running from a container to decide whether we'll +use the kernel command line from /proc/cmdline. +--- + src/kernel-install/90-loaderentry.install.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/kernel-install/90-loaderentry.install.in b/src/kernel-install/90-loaderentry.install.in +index 4ef6aca169c1a..79427684cc5c9 100755 +--- a/src/kernel-install/90-loaderentry.install.in ++++ b/src/kernel-install/90-loaderentry.install.in +@@ -79,8 +79,10 @@ elif [ -f /etc/kernel/cmdline ]; then + BOOT_OPTIONS="$(tr -s "$IFS" ' '