shaba/dracut
1
0
Fork 0
mirror of https://github.com/dracutdevs/dracut.git synced 2024-10-26 16:25:20 +03:00
Code Issues Projects Releases Wiki Activity

Revert "95rootfs-block: Correctly terminate commandline parameter"

Browse Source 
This reverts commit 4b6b46bb2a.

$ ./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
…
This commit is contained in:
Harald Hoyer 2014-12-17 11:44:18 +01:00
parent bea41b898a
commit a17d5cf494
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dracut.sh
View File

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

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

@ -22,7 +22,7 @@ cmdline_journal() {
fi
if [ -n "$journaldev" ]; then
echo "root.journaldev=${journaldev}"
printf " root.journaldev=%s" "$journaldev"
fi
done
fi
@ -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
}