dracut/0050-95iscsi-strip-one-set-of-quotes-when-calling-initque.patch

47 lines
1.6 KiB
Diff
Raw Normal View History

From 55817d44cd85733072d61e20ed6c790f8252b00f Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 27 May 2014 13:30:17 +0200
Subject: [PATCH] 95iscsi: strip one set of quotes when calling initqueue
Accepting request 235703 from home:trenn:branches:Base:System - Update to latest git HEAD: commit 0fa5dbedc5b222435f51f7460a81232ee120c4e1 Tue May 20 13:23 Modified dracut_v37_to_HEAD.patch Modified mdraid-setup.patch Modified dracut-install-persistent-rule.patch - Add /etc/dracut.d.conf/01-dist modifications to file instead of writing to it via rpm build section Add 0033-dracut_hostonly_hostonly_cmdline_default.patch Add 0034-suse.conf.example_extend.patch - Cleanup mkinitrd-suse.sh: * Remove hostonly and hostonly-cmdline -> this is done via 01-dist config file now - Always add network module based on modules_setup.sh check() function and not via 01-dist config file Add 0035-always_add_network.patch - Add find to debug binaries - Useful and harmless Add 0036-add_extra_debug_binaries.patch - Fix adding of network modules for s390 (bnc#879302) Add 0037-fix_s390_network_modules_install.patch - Omit resume module on s390(x) - There is no suspend on s390 Add 0039-s390_no_resume_module.patch - Do not wait for swap - This causes trouble with Rudi's autobuild images: Add 0038-remove_waiting_for_swap_dev.patch - Fcoe and ibft fixes (bnc#879038): Add 0041-only_enable_network_if_explicitly_requested.patch Add 0042-ibft_autoconfig_param.patch Add 0043-fcoe_strip_quotes.patch - Print message when starting to update bootloader Add 0044-Add_update_bootloader_msg.patch - ToDo: Pass hostonly variable earlier so that is always avail in check() OBS-URL: https://build.opensuse.org/request/show/235703 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=151
2014-05-28 16:30:59 +00:00
initqueue will process the arguments, assuming the first non-option
argument to be the program to be executed. Putting the entire
commandline into this argument confuses both, initqueue and the
program in question.
Accepting request 235703 from home:trenn:branches:Base:System - Update to latest git HEAD: commit 0fa5dbedc5b222435f51f7460a81232ee120c4e1 Tue May 20 13:23 Modified dracut_v37_to_HEAD.patch Modified mdraid-setup.patch Modified dracut-install-persistent-rule.patch - Add /etc/dracut.d.conf/01-dist modifications to file instead of writing to it via rpm build section Add 0033-dracut_hostonly_hostonly_cmdline_default.patch Add 0034-suse.conf.example_extend.patch - Cleanup mkinitrd-suse.sh: * Remove hostonly and hostonly-cmdline -> this is done via 01-dist config file now - Always add network module based on modules_setup.sh check() function and not via 01-dist config file Add 0035-always_add_network.patch - Add find to debug binaries - Useful and harmless Add 0036-add_extra_debug_binaries.patch - Fix adding of network modules for s390 (bnc#879302) Add 0037-fix_s390_network_modules_install.patch - Omit resume module on s390(x) - There is no suspend on s390 Add 0039-s390_no_resume_module.patch - Do not wait for swap - This causes trouble with Rudi's autobuild images: Add 0038-remove_waiting_for_swap_dev.patch - Fcoe and ibft fixes (bnc#879038): Add 0041-only_enable_network_if_explicitly_requested.patch Add 0042-ibft_autoconfig_param.patch Add 0043-fcoe_strip_quotes.patch - Print message when starting to update bootloader Add 0044-Add_update_bootloader_msg.patch - ToDo: Pass hostonly variable earlier so that is always avail in check() OBS-URL: https://build.opensuse.org/request/show/235703 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=151
2014-05-28 16:30:59 +00:00
References: bnc#879038
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
modules.d/95iscsi/parse-iscsiroot.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh
index 9651a20..3a572f7 100755
--- a/modules.d/95iscsi/parse-iscsiroot.sh
+++ b/modules.d/95iscsi/parse-iscsiroot.sh
@@ -61,10 +61,10 @@ fi
Accepting request 235703 from home:trenn:branches:Base:System - Update to latest git HEAD: commit 0fa5dbedc5b222435f51f7460a81232ee120c4e1 Tue May 20 13:23 Modified dracut_v37_to_HEAD.patch Modified mdraid-setup.patch Modified dracut-install-persistent-rule.patch - Add /etc/dracut.d.conf/01-dist modifications to file instead of writing to it via rpm build section Add 0033-dracut_hostonly_hostonly_cmdline_default.patch Add 0034-suse.conf.example_extend.patch - Cleanup mkinitrd-suse.sh: * Remove hostonly and hostonly-cmdline -> this is done via 01-dist config file now - Always add network module based on modules_setup.sh check() function and not via 01-dist config file Add 0035-always_add_network.patch - Add find to debug binaries - Useful and harmless Add 0036-add_extra_debug_binaries.patch - Fix adding of network modules for s390 (bnc#879302) Add 0037-fix_s390_network_modules_install.patch - Omit resume module on s390(x) - There is no suspend on s390 Add 0039-s390_no_resume_module.patch - Do not wait for swap - This causes trouble with Rudi's autobuild images: Add 0038-remove_waiting_for_swap_dev.patch - Fcoe and ibft fixes (bnc#879038): Add 0041-only_enable_network_if_explicitly_requested.patch Add 0042-ibft_autoconfig_param.patch Add 0043-fcoe_strip_quotes.patch - Print message when starting to update bootloader Add 0044-Add_update_bootloader_msg.patch - ToDo: Pass hostonly variable earlier so that is always avail in check() OBS-URL: https://build.opensuse.org/request/show/235703 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=151
2014-05-28 16:30:59 +00:00
# iscsi_firmware does not need argument checking
if [ -n "$iscsi_firmware" ] ; then
- netroot=${netroot:-iscsi:}
+ [ -z "$netroot" ] && netroot=iscsi:
modprobe -q iscsi_boot_sysfs 2>/dev/null
modprobe -q iscsi_ibft
- initqueue --onetime --timeout "/sbin/iscsiroot dummy '$netroot' '$NEWROOT'"
Accepting request 235703 from home:trenn:branches:Base:System - Update to latest git HEAD: commit 0fa5dbedc5b222435f51f7460a81232ee120c4e1 Tue May 20 13:23 Modified dracut_v37_to_HEAD.patch Modified mdraid-setup.patch Modified dracut-install-persistent-rule.patch - Add /etc/dracut.d.conf/01-dist modifications to file instead of writing to it via rpm build section Add 0033-dracut_hostonly_hostonly_cmdline_default.patch Add 0034-suse.conf.example_extend.patch - Cleanup mkinitrd-suse.sh: * Remove hostonly and hostonly-cmdline -> this is done via 01-dist config file now - Always add network module based on modules_setup.sh check() function and not via 01-dist config file Add 0035-always_add_network.patch - Add find to debug binaries - Useful and harmless Add 0036-add_extra_debug_binaries.patch - Fix adding of network modules for s390 (bnc#879302) Add 0037-fix_s390_network_modules_install.patch - Omit resume module on s390(x) - There is no suspend on s390 Add 0039-s390_no_resume_module.patch - Do not wait for swap - This causes trouble with Rudi's autobuild images: Add 0038-remove_waiting_for_swap_dev.patch - Fcoe and ibft fixes (bnc#879038): Add 0041-only_enable_network_if_explicitly_requested.patch Add 0042-ibft_autoconfig_param.patch Add 0043-fcoe_strip_quotes.patch - Print message when starting to update bootloader Add 0044-Add_update_bootloader_msg.patch - ToDo: Pass hostonly variable earlier so that is always avail in check() OBS-URL: https://build.opensuse.org/request/show/235703 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=151
2014-05-28 16:30:59 +00:00
+ initqueue --onetime --timeout /sbin/iscsiroot dummy "$netroot" "$NEWROOT"
fi
# If it's not iscsi we don't continue
@@ -88,7 +88,7 @@ fi
Accepting request 235703 from home:trenn:branches:Base:System - Update to latest git HEAD: commit 0fa5dbedc5b222435f51f7460a81232ee120c4e1 Tue May 20 13:23 Modified dracut_v37_to_HEAD.patch Modified mdraid-setup.patch Modified dracut-install-persistent-rule.patch - Add /etc/dracut.d.conf/01-dist modifications to file instead of writing to it via rpm build section Add 0033-dracut_hostonly_hostonly_cmdline_default.patch Add 0034-suse.conf.example_extend.patch - Cleanup mkinitrd-suse.sh: * Remove hostonly and hostonly-cmdline -> this is done via 01-dist config file now - Always add network module based on modules_setup.sh check() function and not via 01-dist config file Add 0035-always_add_network.patch - Add find to debug binaries - Useful and harmless Add 0036-add_extra_debug_binaries.patch - Fix adding of network modules for s390 (bnc#879302) Add 0037-fix_s390_network_modules_install.patch - Omit resume module on s390(x) - There is no suspend on s390 Add 0039-s390_no_resume_module.patch - Do not wait for swap - This causes trouble with Rudi's autobuild images: Add 0038-remove_waiting_for_swap_dev.patch - Fcoe and ibft fixes (bnc#879038): Add 0041-only_enable_network_if_explicitly_requested.patch Add 0042-ibft_autoconfig_param.patch Add 0043-fcoe_strip_quotes.patch - Print message when starting to update bootloader Add 0044-Add_update_bootloader_msg.patch - ToDo: Pass hostonly variable earlier so that is always avail in check() OBS-URL: https://build.opensuse.org/request/show/235703 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=151
2014-05-28 16:30:59 +00:00
if [ -n "$netroot" ] && [ "$root" != "/dev/root" ] && [ "$root" != "dhcp" ]; then
if ! getargbool 1 rd.neednet >/dev/null || ! getarg "ip="; then
- initqueue --onetime --settled "/sbin/iscsiroot dummy '$netroot' '$NEWROOT'"
+ initqueue --onetime --settled /sbin/iscsiroot dummy "$netroot" "$NEWROOT"
fi
fi
--
1.8.4.5