c0e1df1a13
- Update with patches from git repository:
* kernel-modules: add ohci-pci to the list of forced module installs
* Run 'xz' and 'lzma' with multiple threads
* systemd: do not exit the initqueue, if systemd asks a password
* iscsi,nbd: do not fail in hostonly mode
* dracut-functions.sh: Avoid loading unnecessary 32-bit libraries
for 64-bit initrds
* fips: also install /etc/system-fips in the initramfs
* dracut.modules.7.asc: removed empty section
* dracut.sh: fixed PATH shortener
* dracut.spec: move /sbin/dracut to /usr/sbin/dracut
* iscsi/nbd: do not try to mount the whole disk, if root= is missing
* fips: include crct10dif_generic
* Handle crypto modules with and without modaliases
* usrmount/module-setup.sh: fixed typo
* lvm: always install thin utils for lvm
* kernel-modules(ARM): add mmc_block usb_storage to static list of
kernel mods
* dracut-functions.sh:check_block_and_slaves*() skip LVM internal devs
* mkdir basic dirs in /run
* network/fcoe: only redirect output to loginit.pipe, if exists
* dracut.sh: no need to make subdirs in run
* dracut.sh: also mkdir /run/lock, which is copied to
* lvm: fix thin recognition
* Add lzo, lz4 compression and read INITRD_COMPRESS
* remove resume-genrules.sh
* resume: fix swap detection in hostonly
* base/init.sh: also mkdir /run/lock
* dmsquash-live: add /dev/mapper/live-base
* Doc: cleanup, extend and split and reuse
OBS-URL: https://build.opensuse.org/request/show/208892
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=82
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From 7d00da419fcbdb8736cbbe7caf13209589b43d9c Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Thu, 21 Nov 2013 12:33:57 +0100
|
|
Subject: [PATCH] 95dasd_mod: make dasd_cio_free optional
|
|
|
|
dasd_cio_free is a RedHat-specific tool, so make it optional.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/95dasd_mod/module-setup.sh | 3 ++-
|
|
modules.d/95dasd_mod/parse-dasd-mod.sh | 4 +++-
|
|
2 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/modules.d/95dasd_mod/module-setup.sh b/modules.d/95dasd_mod/module-setup.sh
|
|
index 011010d..8fde525 100755
|
|
--- a/modules.d/95dasd_mod/module-setup.sh
|
|
+++ b/modules.d/95dasd_mod/module-setup.sh
|
|
@@ -23,6 +23,7 @@ installkernel() {
|
|
# called by dracut
|
|
install() {
|
|
inst_hook cmdline 31 "$moddir/parse-dasd-mod.sh"
|
|
- inst_multiple dasd_cio_free grep sed seq
|
|
+ inst_multiple grep sed seq
|
|
+ inst_multiple -o dasd_cio_free
|
|
}
|
|
|
|
diff --git a/modules.d/95dasd_mod/parse-dasd-mod.sh b/modules.d/95dasd_mod/parse-dasd-mod.sh
|
|
index 87c88ed..0236d12 100755
|
|
--- a/modules.d/95dasd_mod/parse-dasd-mod.sh
|
|
+++ b/modules.d/95dasd_mod/parse-dasd-mod.sh
|
|
@@ -15,4 +15,6 @@ if [ -n "$mod_args" ]; then
|
|
fi
|
|
|
|
unset dasd_arg
|
|
-dasd_cio_free
|
|
+if [ -x /sbin/dasd_cio_free ] ; then
|
|
+ dasd_cio_free
|
|
+fi
|
|
--
|
|
1.8.1.4
|
|
|