From 827e7c0e82c5ae7d0ddebc5b67a1c767d39eded6 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Mon, 7 Jul 2014 01:13:40 +0200 Subject: Fixup missing separators in rootfs-block cmdline This fixes up 21e4cbee5d852108880cedc9edc619cdd9b296a5 by re-introducing the spaces between the arguments. [hare: moving printf statement into one line] Signed-off-by: Thorsten Behrens Signed-off-by: Hannes Reinecke --- dracut.cmdline.7.asc | 3 +++ modules.d/95rootfs-block/module-setup.sh | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc index 2dc795b..228d571 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -134,6 +134,9 @@ Misc specify the controlling terminal for the console. This is useful, if you have multiple "console=" arguments. +**rd.nocmdline**:: + Skip built-in commandline arguments + [[dracutkerneldebug]] Debug ~~~~~ diff --git a/modules.d/95rootfs-block/module-setup.sh b/modules.d/95rootfs-block/module-setup.sh index a620786..7f3b156 100755 --- a/modules.d/95rootfs-block/module-setup.sh +++ b/modules.d/95rootfs-block/module-setup.sh @@ -34,9 +34,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\n" "$(find_mp_fstype /)" + printf "root=%s rootflags=%s rootfstype=%s\n" \ + "$(shorten_persistent_dev "$(get_persistent_dev "$dev")")" \ + "$(find_mp_fsopts /)" "$(find_mp_fstype /)" fi } -- 1.8.4.5