Shawn Dunn
b523995f47
- More empty commandline fixes * Add: 0074-More-empty-cmdline-fixes.patch - 95dasd_rules: enable parsing of rd.dasd= commandline parameter * Add: 0075-95dasd_rules-enable-parsing-of-rd.dasd-commandline-p.patch - Correctly set cio_ignore for dynamic s390 rules * Add: 0076-Correctly-set-cio_ignore-for-dynamic-s390-rules.patch - 90multipath: add missing 11-dm-mpath.rules file (bnc#883149) * Add: 0077-90multipath-add-missing-11-dm-mpath.rules-file.patch - Restore original IFS value (bnc#883770) * Add: 0078-Restore-original-IFS-value.patch - Fix non-export of journal dev boot options * Add: 0071-Fix-non-export-of-journal-dev-boot-options.patch - Also export root= boot param for hostonly-cmdline * Add: 0072-Also-export-root-boot-param-for-hostonly-cmdline-cas.patch - Don't create lots of empty cmdline files * Add: 0073-Don-t-create-lots-of-empty-cmdline-files-for-hostonl.patch OBS-URL: https://build.opensuse.org/request/show/238369 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=164
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From f483c78483992a7778751f9a01bbf09feb2b5bbe Mon Sep 17 00:00:00 2001
|
|
From: Thorsten Behrens <tbehrens@suse.com>
|
|
Date: Wed, 18 Jun 2014 01:57:29 +0200
|
|
Subject: Fix non-export of journal dev boot options.
|
|
|
|
cmdline_journal does not contain linefeeds anymore, so read
|
|
silently skipped it altogether.
|
|
|
|
Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
|
|
---
|
|
modules.d/95rootfs-block/module-setup.sh | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/modules.d/95rootfs-block/module-setup.sh b/modules.d/95rootfs-block/module-setup.sh
|
|
index b209ab6..5f1b826 100755
|
|
--- a/modules.d/95rootfs-block/module-setup.sh
|
|
+++ b/modules.d/95rootfs-block/module-setup.sh
|
|
@@ -45,9 +45,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
|
|
--
|
|
1.8.4.5
|
|
|