5f3aadd9ae
- 95dasd_rules: Fixup rd.dasd parsing * Add: 0079-95dasd_rules-fixup-rd.dasd-parsing.patch - 95dasd_rules: Print out rd.dasd command-line * Add: 0080-95dasd_rules-print-out-rd.dasd-commandline.patch - 95dasd_mod: do not set module parameter * Add: 0081-95dasd_mod-do-not-set-module-parameters-if-dasd_cio_.patch - 00warpclock: Check for /sbin/hwclock (bnc#884513) * Add: 0082-00warpclock-check-for-sbin-hwclock.patch - 95zfcp_rules: Fixup rd.zfcp parsing * Add: 0083-95zfcp_rules-Fixup-rd.zfcp-parsing.patch - 95rootfs_block: terminate commandline parameter * Add: 0084-95rootfs-block-Correctly-terminate-commandline-param.patch - 95zfcp_rules: Print out rd.zfcp command-line * Add: 0085-95zfcp_rules-print-out-rd.zfcp-commandline-parameter.patch - 95zfcp_rules: Auto-generate ipl device rule * Add: 0086-95zfcp_rules-Auto-generate-udev-rule-for-ipl-device.patch - 95dasd_rules: Auto-generate ipl device rule * Add: 0087-95dasd_rules-Auto-generate-udev-rule-for-ipl-device.patch OBS-URL: https://build.opensuse.org/request/show/238799 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=165
62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
From 21e4cbee5d852108880cedc9edc619cdd9b296a5 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Thu, 26 Jun 2014 13:41:56 +0200
|
|
Subject: 95rootfs-block: Correctly terminate commandline parameter
|
|
|
|
95rootfs-block would not terminate the commandline parameter with
|
|
a space or newline, instead it'll rely on the main routine from
|
|
dracut.sh to do this.
|
|
Which will cause unexpected problems for any modules called
|
|
after this.
|
|
|
|
So terminate the commandline parameters correctly here and remove
|
|
the newline from dracut.sh.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
dracut.sh | 1 -
|
|
modules.d/95rootfs-block/module-setup.sh | 8 ++++----
|
|
2 files changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/dracut.sh b/dracut.sh
|
|
index a58e134..40006e7 100755
|
|
--- a/dracut.sh
|
|
+++ b/dracut.sh
|
|
@@ -1166,7 +1166,6 @@ if [[ $print_cmdline ]]; then
|
|
module_cmdline "$_d_mod"
|
|
done
|
|
unset moddir
|
|
- printf "\n"
|
|
exit 0
|
|
fi
|
|
|
|
diff --git a/modules.d/95rootfs-block/module-setup.sh b/modules.d/95rootfs-block/module-setup.sh
|
|
index b868d0b..a620786 100755
|
|
--- a/modules.d/95rootfs-block/module-setup.sh
|
|
+++ b/modules.d/95rootfs-block/module-setup.sh
|
|
@@ -24,7 +24,7 @@ cmdline_journal() {
|
|
fi
|
|
|
|
if [ -n "$journaldev" ]; then
|
|
- printf " root.journaldev=%s" "$journaldev"
|
|
+ echo "root.journaldev=${journaldev}"
|
|
fi
|
|
done
|
|
fi
|
|
@@ -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" "$(find_mp_fstype /)"
|
|
+ printf "root=%s" "$(shorten_persistent_dev "$(get_persistent_dev "$dev")")"
|
|
+ printf "rootflags=%s" "$(find_mp_fsopts /)"
|
|
+ printf "rootfstype=%s\n" "$(find_mp_fstype /)"
|
|
fi
|
|
}
|
|
|
|
--
|
|
1.8.4.5
|
|
|