mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-01-07 17:17:44 +03:00
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. (cherry picked from commit 35c01ec59e0c2e6bd06cb18ca2ff612c6a7ea35d) (cherry picked from commit c386327fc851863abf4c27076bd368dfc55b83a0)
This commit is contained in:
parent
ce63101856
commit
0b4d00b284
@ -79,8 +79,10 @@ elif [ -f /etc/kernel/cmdline ]; then
|
||||
BOOT_OPTIONS="$(tr -s "$IFS" ' ' </etc/kernel/cmdline)"
|
||||
elif [ -f /usr/lib/kernel/cmdline ]; then
|
||||
BOOT_OPTIONS="$(tr -s "$IFS" ' ' </usr/lib/kernel/cmdline)"
|
||||
else
|
||||
elif ! systemd-detect-virt --container --quiet; then
|
||||
BOOT_OPTIONS="$(tr -s "$IFS" '\n' </proc/cmdline | grep -ve '^BOOT_IMAGE=' -e '^initrd=' | tr '\n' ' ')"
|
||||
else
|
||||
BOOT_OPTIONS=""
|
||||
fi
|
||||
|
||||
BOOT_OPTIONS="${BOOT_OPTIONS% }"
|
||||
@ -194,7 +196,7 @@ mkdir -p "${LOADER_ENTRY%/*}" || {
|
||||
echo "machine-id $MACHINE_ID"
|
||||
fi
|
||||
[ -n "$SORT_KEY" ] && echo "sort-key $SORT_KEY"
|
||||
echo "options $BOOT_OPTIONS"
|
||||
[ -n "$BOOT_OPTIONS" ] && echo "options $BOOT_OPTIONS"
|
||||
echo "linux $KERNEL_ENTRY"
|
||||
[ -n "$DEVICETREE_ENTRY" ] && echo "devicetree $DEVICETREE_ENTRY"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user