Skip to content

Commit

Permalink
Revert "95rootfs-block: Correctly terminate commandline parameter"
Browse files Browse the repository at this point in the history
This reverts commit 4b6b46b.

$ ./dracut.sh -l --print-cmdline
root=UUID=d5e53483-30bc-4119-8c0c-841d47a2f76brootflags=rw,noatime,compress=lzo,ssd,discard,space_cache,autodefrag,inode_cacherootfstype=btrfs

instead of:

$ ./dracut.sh -l --print-cmdline
 root=UUID=d5e53483-30bc-4119-8c0c-841d47a2f76b
rootflags=rw,noatime,compress=lzo,ssd,discard,space_cache,autodefrag,inode_cache
rootfstype=btrfs

and also

$ make testimage
…
 *** Store current command line parameters ***
Stored kernel commandline:
root=UUID=d5e53483-30bc-4119-8c0c-841d47a2f76brootflags=rw,noatime,compress=lzo,ssd,discard,space_cache,autodefrag,inode_cacherootfstype=btrfs
…
  • Loading branch information
haraldh committed Dec 17, 2014
1 parent bea41b8 commit a17d5cf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions dracut.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1299,6 +1299,7 @@ if [[ $print_cmdline ]]; then
module_cmdline "$_d_mod"
done
unset moddir
printf "\n"
exit 0
fi

Expand Down
8 changes: 4 additions & 4 deletions modules.d/95rootfs-block/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cmdline_journal() {
fi

if [ -n "$journaldev" ]; then
echo "root.journaldev=${journaldev}"
printf " root.journaldev=%s" "$journaldev"
fi
done
fi
Expand All @@ -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\n" "$(find_mp_fstype /)"
printf " root=%s" "$(shorten_persistent_dev "$(get_persistent_dev "$dev")")"
printf " rootflags=%s" "$(find_mp_fsopts /)"
printf " rootfstype=%s" "$(find_mp_fstype /)"
fi
}

Expand Down

0 comments on commit a17d5cf

Please sign in to comment.