89f9350d9e
- Fix dmraid issue bnc#905746 A dracut_dmraid_use_udev.patch - Taken over from SLE12 A fips_add_aesni-intel.patch - Do not touch /run vs /var/run bnc#922676 D 0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch - Update dracut to version 042 Remove these already included or unneeded patches: D dracut_v041_to_HEAD.patch D 0011-Correct-paths-for-openSUSE.patch D 0068-95fcoe-uefi-Test-for-EFI-firmware.patch D 0170-enable-logitech-hidpp.patch Adjust/refresh: M 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch M 0016-Add-new-s390x-specific-rule-files.patch M 0017-45ifcfg-use-distro-specific-scripts.patch M 0019-40network-Fix-race-condition-when-wait-for-networks.patch M 0020-00warpclock-Set-correct-timezone.patch M 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch M 0048-40network-Only-enable-network-interfaces-if-explicit.patch M 0053-01fips-fixup-loading-issues.patch M 0056-81cio_ignore-handle-cio_ignore-commandline.patch M 0057-01fips-Include-some-more-hmacs.patch M 0058-dracut-add-warning-when-including-unsupported-module.patch M 0059-99suse-Add-SUSE-specific-initrd-parsing.patch M 0060-45ifcfg-Add-SUSE-specific-write-ifcfg-file.patch M 0061-45ifcfg-Fixup-error-message-in-write-ifcfg-suse.patch M 0066-40network-always-start-netroot-in-ifup.sh.patch M 0075-95dasd_rules-enable-parsing-of-rd.dasd-commandline-p.patch M 0076-Correctly-set-cio_ignore-for-dynamic-s390-rules.patch OBS-URL: https://build.opensuse.org/request/show/314510 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=219
55 lines
2.5 KiB
Diff
55 lines
2.5 KiB
Diff
From 488cf7ad86eee4cd9138d5e58c1baefeeb5e8c98 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Thu, 10 Jul 2014 15:58:24 +0200
|
|
Subject: 91zipl: Install script as executable
|
|
|
|
initqueue will only work with executable scripts, so we need to
|
|
mark it as such.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/91zipl/install_zipl_cmdline.sh | 2 +-
|
|
modules.d/91zipl/module-setup.sh | 2 +-
|
|
modules.d/91zipl/parse-zipl.sh | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
mode change 100644 => 100755 modules.d/91zipl/install_zipl_cmdline.sh
|
|
|
|
Index: dracut-042/modules.d/91zipl/install_zipl_cmdline.sh
|
|
===================================================================
|
|
--- dracut-042.orig/modules.d/91zipl/install_zipl_cmdline.sh 2015-06-24 18:02:12.621557615 +0200
|
|
+++ dracut-042/modules.d/91zipl/install_zipl_cmdline.sh 2015-06-24 18:02:15.773737066 +0200
|
|
@@ -1,6 +1,6 @@
|
|
#!/bin/bash
|
|
|
|
-DEV=$1
|
|
+DEV="$1"
|
|
MNT=/boot/zipl
|
|
|
|
if [ -z "$DEV" ] ; then
|
|
Index: dracut-042/modules.d/91zipl/module-setup.sh
|
|
===================================================================
|
|
--- dracut-042.orig/modules.d/91zipl/module-setup.sh 2015-06-24 18:02:14.857684916 +0200
|
|
+++ dracut-042/modules.d/91zipl/module-setup.sh 2015-06-24 18:02:15.773737066 +0200
|
|
@@ -35,7 +35,7 @@ install() {
|
|
inst_multiple mount umount
|
|
|
|
inst_hook cmdline 91 "$moddir/parse-zipl.sh"
|
|
- inst "${moddir}/install_zipl_cmdline.sh" /sbin/install_zipl_cmdline.sh
|
|
+ inst_script "${moddir}/install_zipl_cmdline.sh" /sbin/install_zipl_cmdline.sh
|
|
if [[ $hostonly_cmdline == "yes" ]] ; then
|
|
local _zipl=$(cmdline)
|
|
|
|
Index: dracut-042/modules.d/91zipl/parse-zipl.sh
|
|
===================================================================
|
|
--- dracut-042.orig/modules.d/91zipl/parse-zipl.sh 2015-06-24 18:02:12.621557615 +0200
|
|
+++ dracut-042/modules.d/91zipl/parse-zipl.sh 2015-06-24 18:02:15.773737066 +0200
|
|
@@ -31,7 +31,7 @@ if [ -n "$zipl_arg" ] ; then
|
|
esac
|
|
if [ "$zipl_env" ] ; then
|
|
{
|
|
- printf 'ACTION=="add|change", SUBSYSTEM=="block", %s=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/install_zipl_cmdline.sh %s"\n' \
|
|
+ printf 'ACTION=="add|change", SUBSYSTEM=="block", %s=="%s", RUN+="/sbin/initqueue --settled --onetime --unique --name install_zipl_cmdline /sbin/install_zipl_cmdline.sh %s"\n' \
|
|
${zipl_env} ${zipl_val} ${zipl_arg}
|
|
echo "[ -f /tmp/install.zipl.cmdline-done ]" >$hookdir/initqueue/finished/wait-zipl-conf.sh
|
|
} >> /etc/udev/rules.d/99zipl-conf.rules
|