]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
Fix non-export of journal dev boot options.
authorThorsten Behrens <tbehrens@suse.com>
Thu, 11 Dec 2014 14:46:29 +0000 (15:46 +0100)
committerHarald Hoyer <harald@redhat.com>
Tue, 16 Dec 2014 12:29:37 +0000 (13:29 +0100)
cmdline_journal does not contain linefeeds anymore, so read
silently skipped it altogether.

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
Signed-off-by: Thomas Renninger <trenn@suse.de>
modules.d/95rootfs-block/module-setup.sh

index 258b32f8e640ef36fe6d8289948f82aa2728f2f7..c2f71bba7ffe435a608aa8258be89a8c15a16dad 100755 (executable)
@@ -43,9 +43,8 @@ cmdline() {
 # called by dracut
 install() {
     if [[ $hostonly_cmdline == "yes" ]]; then
-        cmdline_journal | while read journaldev; do
-            [[ $journaldev ]] && printf "%s\n" "$journaldev" >> "${initdir}/etc/cmdline.d/95root-journaldev.conf"
-        done
+        local _journaldev=$(cmdline_journal)
+        [[ $_journaldev ]] && printf "%s\n" "$_journaldev" >> "${initdir}/etc/cmdline.d/95root-journaldev.conf"
     fi
 
     inst_multiple umount