From 6fd2ccc957f21a423e1457c66e53b1697944d72a Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 1 Jun 2015 11:28:03 +0200 Subject: 90-loaderentry.install: fixup BOOT_OPTIONS better use "read -r -d '' -a" to read in the array. It handles multiple lines and missing newline at the EOF. --- src/kernel-install/90-loaderentry.install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install index d433e00a5c..4c9b1f0327 100644 --- a/src/kernel-install/90-loaderentry.install +++ b/src/kernel-install/90-loaderentry.install @@ -43,14 +43,14 @@ fi declare -a BOOT_OPTIONS if [[ -f /etc/kernel/cmdline ]]; then - readarray -t BOOT_OPTIONS < /etc/kernel/cmdline + read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline fi if ! [[ ${BOOT_OPTIONS[*]} ]]; then - read -a line -r < /proc/cmdline + read -r -d '' -a line < /proc/cmdline for i in "${line[@]}"; do [[ "${i#initrd=*}" != "$i" ]] && continue - BOOT_OPTIONS[${#BOOT_OPTIONS[@]}]="$i" + BOOT_OPTIONS+=("$i") done fi -- cgit v1.2.3-54-g00ecf