diff options
| author | Michael Chapman <mike@very.puzzling.org> | 2014-10-29 11:54:07 +1100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-01 14:39:48 -0400 |
| commit | c008f6ee8df9aa36782378d1a3767543b3635a54 (patch) | |
| tree | f0d47eb7d43980d45ab93b94072027ef10ca068c /src/kernel-install | |
| parent | a65b82457735df2ef58736a55846f400124a8dc0 (diff) | |
kernel-install/90-loaderentry.install: fix cmdline parsing
A recent commit (2f3a215) changed the parsing of /proc/cmdline to use a
shell array. Unfortunately, this introduced a bug: "read -ar line"
populates the shell variable $r, not $line. This breaks installation of
new loader entries:
# kernel-install add 3.17.1-304.fc21.x86_64 \
/boot/vmlinuz-3.17.1-304.fc21.x86_64
Could not determine the kernel command line parameters.
Please specify the kernel command line in /etc/kernel/cmdline!
This commit alters the read command to correctly populate the $line
array instead.
Diffstat (limited to 'src/kernel-install')
| -rw-r--r-- | src/kernel-install/90-loaderentry.install | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install index 6f032b5a4b..d433e00a5c 100644 --- a/src/kernel-install/90-loaderentry.install +++ b/src/kernel-install/90-loaderentry.install @@ -47,7 +47,7 @@ if [[ -f /etc/kernel/cmdline ]]; then fi if ! [[ ${BOOT_OPTIONS[*]} ]]; then - read -ar line < /proc/cmdline + read -a line -r < /proc/cmdline for i in "${line[@]}"; do [[ "${i#initrd=*}" != "$i" ]] && continue BOOT_OPTIONS[${#BOOT_OPTIONS[@]}]="$i" |