diff --git a/files/0002-multipath-Use-stateless-configuration-for-non-host-o.patch b/files/0002-multipath-Use-stateless-configuration-for-non-host-o.patch --- a/files/0002-multipath-Use-stateless-configuration-for-non-host-o.patch +++ b/files/0002-multipath-Use-stateless-configuration-for-non-host-o.patch @@ -1,27 +1,27 @@ -From 0a0febf461066fc10e804136a78956c77d09b820 Mon Sep 17 00:00:00 2001 -From: Ikey Doherty -Date: Wed, 16 Aug 2017 17:48:11 +0100 -Subject: [PATCH 2/3] multipath: Use stateless configuration for non-host-only - initrds +From e586429dc791bdce7e12bc00423f6dd3a276645b Mon Sep 17 00:00:00 2001 +From: daper +Date: Wed, 21 Feb 2018 13:43:33 +0100 +Subject: [PATCH] [PATCH 2/3] multipath: Use stateless configuration for + non-host-only initrds -Signed-off-by: Ikey Doherty +Signed-off-by: daper --- modules.d/90multipath/module-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh -index e568339..236da97 100755 +index 446dceb0..7bfa6e6d 100755 --- a/modules.d/90multipath/module-setup.sh +++ b/modules.d/90multipath/module-setup.sh -@@ -64,7 +64,7 @@ install() { +@@ -65,7 +65,7 @@ install() { xdrgetuid \ xdrgetprio \ /etc/xdrdevices.conf \ - /etc/multipath.conf \ + /usr/share/defaults/multipath/multipath.conf \ - /etc/multipath/* + /etc/multipath/* \ + /etc/multipath/conf.d/* - inst $(command -v partx) /sbin/partx -- -2.15.0 +2.16.1 diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,13 +1,15 @@ name : dracut -version : '046' -release : 39 +version : '047' +release : 40 source : - - https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-046.tar.xz : 3cb206abc198811972d452d53e88c32f29dd1b0bb24e35e23b4056aa74824f99 + - https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-047.tar.xz : b0afd3bdd886b2f756743c91a00a155da9df0644625b1c565c3d5ef78cd76ab2 homepage : http://dracut.wiki.kernel.org/index.php/Main_Page license : - GPL-2.0 summary : initramfs system component : system.boot +patterns : + - /usr/share/pkgconfig/dracut.pc description: | dracut is an event driven initramfs infrastructure. dracut (the tool) is used to create an initramfs image by copying tools and files from an installed system and combining it with the dracut framework builddeps : diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -3,8 +3,8 @@ dracut http://dracut.wiki.kernel.org/index.php/Main_Page - Ikey Doherty - ikey@solus-project.com + daper + david@daper.email GPL-2.0 system.boot @@ -35,7 +35,6 @@ /usr/lib64/dracut/dracut.conf.d /usr/lib64/dracut/modules.d/00bash/module-setup.sh /usr/lib64/dracut/modules.d/00bootchart/module-setup.sh - /usr/lib64/dracut/modules.d/00systemd-bootchart/module-setup.sh /usr/lib64/dracut/modules.d/00systemd/module-setup.sh /usr/lib64/dracut/modules.d/01fips/fips-boot.sh /usr/lib64/dracut/modules.d/01fips/fips-noboot.sh @@ -101,6 +100,8 @@ /usr/lib64/dracut/modules.d/80lvmmerge/README.md /usr/lib64/dracut/modules.d/80lvmmerge/lvmmerge.sh /usr/lib64/dracut/modules.d/80lvmmerge/module-setup.sh + /usr/lib64/dracut/modules.d/81cio_ignore/module-setup.sh + /usr/lib64/dracut/modules.d/81cio_ignore/parse-cio_accept.sh /usr/lib64/dracut/modules.d/90btrfs/80-btrfs.rules /usr/lib64/dracut/modules.d/90btrfs/btrfs_device_ready.sh /usr/lib64/dracut/modules.d/90btrfs/btrfs_finished.sh @@ -162,6 +163,7 @@ /usr/lib64/dracut/modules.d/90mdraid/parse-md.sh /usr/lib64/dracut/modules.d/90multipath-hostonly/module-setup.sh /usr/lib64/dracut/modules.d/90multipath/module-setup.sh + /usr/lib64/dracut/modules.d/90multipath/multipath-shutdown.sh /usr/lib64/dracut/modules.d/90multipath/multipathd-needshutdown.sh /usr/lib64/dracut/modules.d/90multipath/multipathd-stop.sh /usr/lib64/dracut/modules.d/90multipath/multipathd.service @@ -173,6 +175,9 @@ /usr/lib64/dracut/modules.d/91crypt-gpg/module-setup.sh /usr/lib64/dracut/modules.d/91crypt-loop/crypt-loop-lib.sh /usr/lib64/dracut/modules.d/91crypt-loop/module-setup.sh + /usr/lib64/dracut/modules.d/91zipl/install_zipl_cmdline.sh + /usr/lib64/dracut/modules.d/91zipl/module-setup.sh + /usr/lib64/dracut/modules.d/91zipl/parse-zipl.sh /usr/lib64/dracut/modules.d/95cifs/cifs-lib.sh /usr/lib64/dracut/modules.d/95cifs/cifsroot.sh /usr/lib64/dracut/modules.d/95cifs/module-setup.sh @@ -183,6 +188,8 @@ /usr/lib64/dracut/modules.d/95dasd_mod/parse-dasd-mod.sh /usr/lib64/dracut/modules.d/95dasd_rules/module-setup.sh /usr/lib64/dracut/modules.d/95dasd_rules/parse-dasd.sh + /usr/lib64/dracut/modules.d/95dcssblk/module-setup.sh + /usr/lib64/dracut/modules.d/95dcssblk/parse-dcssblk.sh /usr/lib64/dracut/modules.d/95debug/module-setup.sh /usr/lib64/dracut/modules.d/95fcoe-uefi/module-setup.sh /usr/lib64/dracut/modules.d/95fcoe-uefi/parse-uefifcoe.sh @@ -193,13 +200,19 @@ /usr/lib64/dracut/modules.d/95fcoe/lldpad.sh /usr/lib64/dracut/modules.d/95fcoe/module-setup.sh /usr/lib64/dracut/modules.d/95fcoe/parse-fcoe.sh + /usr/lib64/dracut/modules.d/95fcoe/stop-fcoe.sh /usr/lib64/dracut/modules.d/95fstab-sys/module-setup.sh /usr/lib64/dracut/modules.d/95fstab-sys/mount-sys.sh /usr/lib64/dracut/modules.d/95iscsi/cleanup-iscsi.sh /usr/lib64/dracut/modules.d/95iscsi/iscsiroot.sh + /usr/lib64/dracut/modules.d/95iscsi/iscsistart-flocked.sh /usr/lib64/dracut/modules.d/95iscsi/module-setup.sh /usr/lib64/dracut/modules.d/95iscsi/mount-lun.sh /usr/lib64/dracut/modules.d/95iscsi/parse-iscsiroot.sh + /usr/lib64/dracut/modules.d/95lunmask/fc_transport_scan_lun.sh + /usr/lib64/dracut/modules.d/95lunmask/module-setup.sh + /usr/lib64/dracut/modules.d/95lunmask/parse-lunmask.sh + /usr/lib64/dracut/modules.d/95lunmask/sas_transport_scan_lun.sh /usr/lib64/dracut/modules.d/95nbd/module-setup.sh /usr/lib64/dracut/modules.d/95nbd/nbd-generator.sh /usr/lib64/dracut/modules.d/95nbd/nbdroot.sh @@ -324,12 +337,12 @@ - - 2017-11-21 - 046 + + 2018-02-21 + 047 Packaging update - Ikey Doherty - ikey@solus-project.com + daper + david@daper.email \ No newline at end of file