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
parent
fe116c1670
commit
4b6b46bb2a
|
@ -1299,7 +1299,6 @@ if [[ $print_cmdline ]]; then
|
||||||
module_cmdline "$_d_mod"
|
module_cmdline "$_d_mod"
|
||||||
done
|
done
|
||||||
unset moddir
|
unset moddir
|
||||||
printf "\n"
|
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ cmdline_journal() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$journaldev" ]; then
|
if [ -n "$journaldev" ]; then
|
||||||
printf " root.journaldev=%s" "$journaldev"
|
echo "root.journaldev=${journaldev}"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
@ -32,9 +32,9 @@ cmdline_journal() {
|
||||||
cmdline_rootfs() {
|
cmdline_rootfs() {
|
||||||
local dev=/dev/block/$(find_root_block_device)
|
local dev=/dev/block/$(find_root_block_device)
|
||||||
if [ -e $dev ]; then
|
if [ -e $dev ]; then
|
||||||
printf " root=%s" "$(shorten_persistent_dev "$(get_persistent_dev "$dev")")"
|
printf "root=%s" "$(shorten_persistent_dev "$(get_persistent_dev "$dev")")"
|
||||||
printf " rootflags=%s" "$(find_mp_fsopts /)"
|
printf "rootflags=%s" "$(find_mp_fsopts /)"
|
||||||
printf " rootfstype=%s" "$(find_mp_fstype /)"
|
printf "rootfstype=%s\n" "$(find_mp_fstype /)"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue