Browse Source

95rootfs-block: Correctly terminate commandline parameter

95rootfs-block would not terminate the commandline parameter with
a space or newline, instead it'll rely on the main routine from
dracut.sh to do this.
Which will cause unexpected problems for any modules called
after this.

So terminate the commandline parameters correctly here and remove
the newline from dracut.sh.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Thomas Renninger <trenn@suse.de>
master
Hannes Reinecke 10 years ago committed by Harald Hoyer
parent
commit
4b6b46bb2a
  1. 1
      dracut.sh
  2. 8
      modules.d/95rootfs-block/module-setup.sh

1
dracut.sh

@ -1299,7 +1299,6 @@ if [[ $print_cmdline ]]; then @@ -1299,7 +1299,6 @@ if [[ $print_cmdline ]]; then
module_cmdline "$_d_mod"
done
unset moddir
printf "\n"
exit 0
fi


8
modules.d/95rootfs-block/module-setup.sh

@ -22,7 +22,7 @@ cmdline_journal() { @@ -22,7 +22,7 @@ cmdline_journal() {
fi

if [ -n "$journaldev" ]; then
printf " root.journaldev=%s" "$journaldev"
echo "root.journaldev=${journaldev}"
fi
done
fi
@ -32,9 +32,9 @@ cmdline_journal() { @@ -32,9 +32,9 @@ cmdline_journal() {
cmdline_rootfs() {
local dev=/dev/block/$(find_root_block_device)
if [ -e $dev ]; then
printf " root=%s" "$(shorten_persistent_dev "$(get_persistent_dev "$dev")")"
printf " rootflags=%s" "$(find_mp_fsopts /)"
printf " rootfstype=%s" "$(find_mp_fstype /)"
printf "root=%s" "$(shorten_persistent_dev "$(get_persistent_dev "$dev")")"
printf "rootflags=%s" "$(find_mp_fsopts /)"
printf "rootfstype=%s\n" "$(find_mp_fstype /)"
fi
}


Loading…
Cancel
Save