kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

5?-dracut*.install: better parsing of /proc/cmdline 

"read -r -d '' -a" does, what we want.
master
Harald Hoyer 2015-05-13 11:49:05 +02:00
parent 8cd8820547
commit a601870064
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
50-dracut.install
View File

@ -19,13 +19,13 @@ case "$COMMAND" in
fi

if [[ -f /etc/kernel/cmdline ]]; then
readarray -t BOOT_OPTIONS < /etc/kernel/cmdline
read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline
elif [[ -f /usr/lib/kernel/cmdline ]]; then
readarray -t BOOT_OPTIONS < /usr/lib/kernel/cmdline
read -r -d '' -a BOOT_OPTIONS < /usr/lib/kernel/cmdline
fi

if ! [[ "${BOOT_OPTIONS[@]}" ]]; then
read -ar BOOT_OPTIONS < /proc/cmdline
if ! [[ ${BOOT_OPTIONS[*]} ]]; then
read -r -d '' -a BOOT_OPTIONS < /proc/cmdline
fi

unset noimageifnotneeded

6
51-dracut-rescue.install
View File

@ -40,12 +40,12 @@ fi
[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id

if [[ -f /etc/kernel/cmdline ]]; then
readarray -t BOOT_OPTIONS < /etc/kernel/cmdline
read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline
elif [[ -f /usr/lib/kernel/cmdline ]]; then
readarray -t BOOT_OPTIONS < /usr/lib/kernel/cmdline
read -r -d '' -a BOOT_OPTIONS < /usr/lib/kernel/cmdline
fi
if ! [[ "${BOOT_OPTIONS[@]}" ]]; then
read -ar BOOT_OPTIONS < /proc/cmdline
read -r -d '' -a BOOT_OPTIONS < /proc/cmdline
fi
if ! [[ $BOOT_OPTIONS ]]; then
exit 1