system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-15 12:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

90-loaderentry.install: fixup BOOT_OPTIONS

Browse source 
better use "read -r -d '' -a" to read in the array. It handles multiple
lines and missing newline at the EOF.
This commit is contained in:
Harald Hoyer 2015-06-01 11:28:03 +02:00
parent 6f54f5373a
commit 6fd2ccc957
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/kernel-install/90-loaderentry.install
View file

@ -43,14 +43,14 @@ fi
declare -a BOOT_OPTIONS declare -a BOOT_OPTIONS
if [[ -f /etc/kernel/cmdline ]]; then if [[ -f /etc/kernel/cmdline ]]; then
readarray -t BOOT_OPTIONS < /etc/kernel/cmdline read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline
fi fi
if ! [[ ${BOOT_OPTIONS[*]} ]]; then if ! [[ ${BOOT_OPTIONS[*]} ]]; then
read -a line -r < /proc/cmdline read -r -d '' -a line < /proc/cmdline
for i in "${line[@]}"; do for i in "${line[@]}"; do
[[ "${i#initrd=*}" != "$i" ]] && continue [[ "${i#initrd=*}" != "$i" ]] && continue
BOOT_OPTIONS[${#BOOT_OPTIONS[@]}]="$i" BOOT_OPTIONS+=("$i")
done done
fi fi