- updated to 0.47, partial PLD merge

diff --git a/compressors.patch b/compressors.patch
index 2a997b0c972b3151a94954f900c07afd75de62a1..0a5aa0f6af983bac2a9b1808835deec5145931b9 100644 (file)
--- a/compressors.patch
+++ b/compressors.patch
@@ -1,7 +1,7 @@
-diff -ur dracut-044.orig/dracut.sh dracut-044/dracut.sh
---- dracut-044.orig/dracut.sh  2015-11-30 12:50:20.000000000 +0000
-+++ dracut-044/dracut.sh       2015-11-30 12:59:15.110305000 +0000
-@@ -173,8 +173,6 @@
+diff -urpa dracut-047.orig/dracut.sh dracut-047/dracut.sh
+--- dracut-047.orig/dracut.sh  2018-03-15 12:07:49.000000000 +0000
++++ dracut-047/dracut.sh       2018-03-15 12:10:37.580977945 +0000
+@@ -180,8 +180,6 @@ Creates initial ramdisk images for prelo
    --install-optional [LIST]  Install the space separated list of files into the
                           initramfs, if they exist.
    --gzip                Compress the generated initramfs using gzip.
@@ -10,7 +10,7 @@ diff -ur dracut-044.orig/dracut.sh dracut-044/dracut.sh
    --bzip2               Compress the generated initramfs using bzip2.
                           Make sure your kernel has bzip2 decompression support
                           compiled in, otherwise you will not be able to boot.
-@@ -182,6 +180,8 @@
+@@ -189,6 +187,8 @@ Creates initial ramdisk images for prelo
                           Make sure your kernel has lzma support compiled in,
                           otherwise you will not be able to boot.
    --xz                  Compress the generated initramfs using xz.
@@ -19,12 +19,11 @@ diff -ur dracut-044.orig/dracut.sh dracut-044/dracut.sh
                           Make sure that your kernel has xz support compiled
                           in, otherwise you will not be able to boot.
    --lzo                 Compress the generated initramfs using lzop.
-@@ -769,7 +769,7 @@
- 
+@@ -809,6 +809,7 @@ fi
  if ! [[ $compress ]]; then
      # check all known compressors, if none specified
--    for i in pigz gzip lz4 lzop lzma xz lbzip2 bzip2 cat; do
-+    for i in xz lzma bzip2 lbzip2 gzip pigz lz4 lzop cat; do
+     for i in pigz gzip lz4 lzop zstd lzma xz lbzip2 bzip2 cat; do
++    for i in xz lzma bzip2 lbzip2 gzip pigz lz4 lzop zstd cat; do
          command -v "$i" &>/dev/null || continue
          compress="$i"
          break

diff --git a/dracut.spec b/dracut.spec
index 386506d5341fb77f9f95d299d605a05c31cfb1ae..709ce1510e9d3e7a26427e746bd8cecb1bfd6f40 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,31 +1,31 @@
 Summary:       Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
-Version:       044
+Version:       047
 Release:       1
 License:       GPL v2+
 Group:         Base
 Source0:       https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5: fbb8b6aea24c2f7d328021bbf11788fd
+# Source0-md5: 62d474ccb8411ec4a76ba5c79bc1093a
 Source1:       tld.conf
 Source2:       update-initramfs
-Patch1:                plymouth-libexec.patch
-Patch2:                os-release.patch
-Patch3:                plymouth-logo.patch
-Patch4:                arch-libdir.patch
-Patch6:                prelink-libs.patch
-Patch7:                config.patch
-Patch8:                compressors.patch
-Patch9:                proc_sys_remount.patch
-Patch10:       misc_fixes.patch
-Patch11:       initrd-release.patch
-Patch12:       no_systemd_udevd.patch
+Patch1:                os-release.patch
+Patch2:                arch-libdir.patch
+Patch3:                prelink-libs.patch
+Patch4:                config.patch
+Patch5:                compressors.patch
+Patch6:                proc_sys_remount.patch
+Patch7:                misc_fixes.patch
+Patch8:                initrd-release.patch
+Patch9:                no_systemd_udevd.patch
 URL:           https://dracut.wiki.kernel.org/
 BuildRequires: asciidoc
 BuildRequires: dash
 BuildRequires: docbook-dtd45-xml
 BuildRequires: docbook-style-xsl
+BuildRequires: kmod-devel >= 23
 BuildRequires: libxslt-progs
+BuildRequires: pkgconfig
 Requires:      bash
 Requires:      bzip2
 Requires:      coreutils
@@ -36,6 +36,7 @@ Requires:     glibc-misc
 Requires:      grep
 Requires:      gzip
 Requires:      hardlink
+Requires:      kmod >= 23
 Requires:      sed
 Requires:      udev
 Requires:      util-linux >= 2.22.2-3
@@ -96,7 +97,7 @@ Requires:     bridge-utils
 Requires:      dhcp-client
 Requires:      iproute2
 Requires:      iputils-arping
-Requires:      iputils-ping
+Requires:      ping
 Requires:      nbd
 Requires:      net-tools
 Requires:      nfs-utils-clients
@@ -200,9 +201,6 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
 
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh
@@ -242,8 +240,9 @@ ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/mkinitrd-suse.8
 
 # remove systemd stuff
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{00systemd,00systemd-bootchart,01systemd-initrd,02systemd-networkd,98dracut-systemd}
-%{__rm} $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/90multipath/multipathd.service
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{00systemd,01systemd-initrd,02systemd-networkd,98dracut-systemd}
+%{__rm} $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{90multipath/multipathd,90dmsquash-live/checkisomd5@}.service
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/dracut-*.service.8
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -295,13 +294,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/50plymouth/*.sh
 %dir %{dracutlibdir}/modules.d/80cms
 %attr(755,root,root) %{dracutlibdir}/modules.d/80cms/*.sh
+%dir %{dracutlibdir}/modules.d/80lvmmerge
+%{dracutlibdir}/modules.d/80lvmmerge/README.md
+%attr(755,root,root) %{dracutlibdir}/modules.d/80lvmmerge/*.sh
+%dir %{dracutlibdir}/modules.d/81cio_ignore
+%attr(755,root,root) %{dracutlibdir}/modules.d/81cio_ignore/*.sh
 %dir %{dracutlibdir}/modules.d/90btrfs
 %{dracutlibdir}/modules.d/90btrfs/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90btrfs/*.sh
 %dir %{dracutlibdir}/modules.d/90crypt
 %attr(755,root,root) %{dracutlibdir}/modules.d/90crypt/*.sh
-%dir %{dracutlibdir}/modules.d/91crypt-loop
-%attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-loop/*.sh
 %dir %{dracutlibdir}/modules.d/90dm
 %{dracutlibdir}/modules.d/90dm/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90dm/*.sh
@@ -310,7 +312,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/90dmraid/*.sh
 %dir %{dracutlibdir}/modules.d/90dmsquash-live
 %attr(755,root,root) %{dracutlibdir}/modules.d/90dmsquash-live/*.sh
-%{dracutlibdir}/modules.d/90dmsquash-live/checkisomd5@.service
+%dir %{dracutlibdir}/modules.d/90dmsquash-live-ntfs
+%attr(755,root,root) %{dracutlibdir}/modules.d/90dmsquash-live-ntfs/*.sh
 %dir %{dracutlibdir}/modules.d/90kernel-modules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90kernel-modules/*.sh
 %dir %{dracutlibdir}/modules.d/90lvm
@@ -321,12 +324,23 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/90mdraid/*.sh
 %dir %{dracutlibdir}/modules.d/90multipath
 %attr(755,root,root) %{dracutlibdir}/modules.d/90multipath/*.sh
+%dir %{dracutlibdir}/modules.d/90multipath-hostonly
+%attr(755,root,root) %{dracutlibdir}/modules.d/90multipath-hostonly/*.sh
 %dir %{dracutlibdir}/modules.d/90qemu
 %attr(755,root,root) %{dracutlibdir}/modules.d/90qemu/*.sh
 %dir %{dracutlibdir}/modules.d/91crypt-gpg
+%{dracutlibdir}/modules.d/91crypt-gpg/README
 %attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-gpg/*.sh
+%dir %{dracutlibdir}/modules.d/91crypt-loop
+%attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-loop/*.sh
+%dir %{dracutlibdir}/modules.d/91zipl
+%attr(755,root,root) %{dracutlibdir}/modules.d/91zipl/*.sh
+%dir %{dracutlibdir}/modules.d/95dcssblk
+%attr(755,root,root) %{dracutlibdir}/modules.d/95dcssblk/*.sh
 %dir %{dracutlibdir}/modules.d/95debug
 %attr(755,root,root) %{dracutlibdir}/modules.d/95debug/*.sh
+%dir %{dracutlibdir}/modules.d/95lunmask
+%attr(755,root,root) %{dracutlibdir}/modules.d/95lunmask/*.sh
 %dir %{dracutlibdir}/modules.d/95resume
 %attr(755,root,root) %{dracutlibdir}/modules.d/95resume/*.sh
 %dir %{dracutlibdir}/modules.d/95rootfs-block
@@ -394,20 +408,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_mandir}/man1/lsinitrd.1*
 %{_mandir}/man5/dracut.conf.5*
+%{_mandir}/man7/dracut.bootup.7*
 %{_mandir}/man7/dracut.cmdline.7*
 %{_mandir}/man7/dracut.kernel.7*
 %{_mandir}/man7/dracut.modules.7*
 %{_mandir}/man8/dracut.8*
-%{_mandir}/man8/dracut-cmdline.service.8*
-%{_mandir}/man8/dracut-initqueue.service.8*
-%{_mandir}/man8/dracut-mount.service.8*
-%{_mandir}/man8/dracut-pre-mount.service.8*
-%{_mandir}/man8/dracut-pre-pivot.service.8*
-%{_mandir}/man8/dracut-pre-trigger.service.8*
-%{_mandir}/man8/dracut-pre-udev.service.8*
-%{_mandir}/man8/dracut-shutdown.service.8*
 %{_mandir}/man8/mkinitrd.8*
-%{_mandir}/man7/dracut.bootup.7.gz
 
 #/usr/lib/kernel/install.d/50-dracut.install
 #/usr/lib/kernel/install.d/51-dracut-rescue.install

diff --git a/initrd-release.patch b/initrd-release.patch
index 494b6e3e9ae1e7fd8234477c912b6fb35829ff54..dc8f735dcb55949d871573f78740b973e3bd8d5a 100644 (file)
--- a/initrd-release.patch
+++ b/initrd-release.patch
@@ -1,7 +1,7 @@
-diff -ur dracut-044.orig/modules.d/01systemd-initrd/module-setup.sh dracut-044/modules.d/01systemd-initrd/module-setup.sh
---- dracut-044.orig/modules.d/01systemd-initrd/module-setup.sh 2015-11-25 13:22:28.000000000 +0000
-+++ dracut-044/modules.d/01systemd-initrd/module-setup.sh      2015-11-30 13:03:41.479305000 +0000
-@@ -59,10 +59,8 @@
+diff -urpa dracut-047.orig/modules.d/01systemd-initrd/module-setup.sh dracut-047/modules.d/01systemd-initrd/module-setup.sh
+--- dracut-047.orig/modules.d/01systemd-initrd/module-setup.sh 2018-02-19 09:00:33.000000000 +0000
++++ dracut-047/modules.d/01systemd-initrd/module-setup.sh      2018-03-15 12:17:03.400973601 +0000
+@@ -60,10 +60,8 @@ install() {
          echo VERSION_ID=$VERSION_ID
          echo PRETTY_NAME=\"$PRETTY_NAME\"
          echo ANSI_COLOR=\"$ANSI_COLOR\"
@@ -13,10 +13,10 @@ diff -ur dracut-044.orig/modules.d/01systemd-initrd/module-setup.sh dracut-044/m
      ln -sf initrd-release $initdir/etc/os-release
  }
  
-diff -ur dracut-044.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-044/modules.d/98dracut-systemd/dracut-cmdline.sh
---- dracut-044.orig/modules.d/98dracut-systemd/dracut-cmdline.sh       2015-11-25 13:22:28.000000000 +0000
-+++ dracut-044/modules.d/98dracut-systemd/dracut-cmdline.sh    2015-11-30 13:03:41.480305000 +0000
-@@ -5,7 +5,7 @@
+diff -urpa dracut-047.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-047/modules.d/98dracut-systemd/dracut-cmdline.sh
+--- dracut-047.orig/modules.d/98dracut-systemd/dracut-cmdline.sh       2018-02-19 09:00:33.000000000 +0000
++++ dracut-047/modules.d/98dracut-systemd/dracut-cmdline.sh    2018-03-15 12:17:03.400973601 +0000
+@@ -5,7 +5,7 @@ if [ -f /dracut-state.sh ]; then
  fi
  type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
  
@@ -25,10 +25,10 @@ diff -ur dracut-044.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-044
  [ -n "$VERSION" ] && info "dracut-$VERSION"
  
  if ! getargbool 1 'rd.hostonly'; then
-diff -ur dracut-044.orig/modules.d/99base/dracut-lib.sh dracut-044/modules.d/99base/dracut-lib.sh
---- dracut-044.orig/modules.d/99base/dracut-lib.sh     2015-11-25 13:22:28.000000000 +0000
-+++ dracut-044/modules.d/99base/dracut-lib.sh  2015-11-30 13:03:41.481305000 +0000
-@@ -394,7 +394,7 @@
+diff -urpa dracut-047.orig/modules.d/99base/dracut-lib.sh dracut-047/modules.d/99base/dracut-lib.sh
+--- dracut-047.orig/modules.d/99base/dracut-lib.sh     2018-02-19 09:00:33.000000000 +0000
++++ dracut-047/modules.d/99base/dracut-lib.sh  2018-03-15 12:17:03.400973601 +0000
+@@ -401,7 +401,7 @@ splitsep() {
  }
  
  setdebug() {
@@ -37,10 +37,10 @@ diff -ur dracut-044.orig/modules.d/99base/dracut-lib.sh dracut-044/modules.d/99b
      if [ -z "$RD_DEBUG" ]; then
          if [ -e /proc/cmdline ]; then
              RD_DEBUG=no
-diff -ur dracut-044.orig/modules.d/99base/init.sh dracut-044/modules.d/99base/init.sh
---- dracut-044.orig/modules.d/99base/init.sh   2015-11-30 13:00:40.000000000 +0000
-+++ dracut-044/modules.d/99base/init.sh        2015-11-30 13:03:41.481305000 +0000
-@@ -106,7 +106,7 @@
+diff -urpa dracut-047.orig/modules.d/99base/init.sh dracut-047/modules.d/99base/init.sh
+--- dracut-047.orig/modules.d/99base/init.sh   2018-03-15 12:11:57.000000000 +0000
++++ dracut-047/modules.d/99base/init.sh        2018-03-15 12:17:03.400973601 +0000
+@@ -111,7 +111,7 @@ else
      exec 0<>/dev/console 1<>/dev/console 2<>/dev/console
  fi
  
@@ -49,10 +49,10 @@ diff -ur dracut-044.orig/modules.d/99base/init.sh dracut-044/modules.d/99base/in
  [ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID"
  
  source_conf /etc/conf.d
-diff -ur dracut-044.orig/modules.d/99base/module-setup.sh dracut-044/modules.d/99base/module-setup.sh
---- dracut-044.orig/modules.d/99base/module-setup.sh   2015-11-25 13:22:28.000000000 +0000
-+++ dracut-044/modules.d/99base/module-setup.sh        2015-11-30 13:03:41.482305000 +0000
-@@ -84,10 +84,8 @@
+diff -urpa dracut-047.orig/modules.d/99base/module-setup.sh dracut-047/modules.d/99base/module-setup.sh
+--- dracut-047.orig/modules.d/99base/module-setup.sh   2018-02-19 09:00:33.000000000 +0000
++++ dracut-047/modules.d/99base/module-setup.sh        2018-03-15 12:17:03.400973601 +0000
+@@ -86,10 +86,8 @@ install() {
          echo VERSION_ID=$VERSION_ID
          echo PRETTY_NAME=\"$PRETTY_NAME\"
          echo ANSI_COLOR=\"$ANSI_COLOR\"

diff --git a/misc_fixes.patch b/misc_fixes.patch
index 9617e60ca332be1a5a1529dc726fd57fa3e2f7b5..be00a69b350ac8e3bbc698fc560f82872c31520c 100644 (file)
--- a/misc_fixes.patch
+++ b/misc_fixes.patch
@@ -1,7 +1,7 @@
-diff -ur dracut-044.orig/modules.d/90lvm/module-setup.sh dracut-044/modules.d/90lvm/module-setup.sh
---- dracut-044.orig/modules.d/90lvm/module-setup.sh    2015-11-25 13:22:28.000000000 +0000
-+++ dracut-044/modules.d/90lvm/module-setup.sh 2015-11-30 13:03:04.369305000 +0000
-@@ -73,9 +73,9 @@
+diff -urpa dracut-047.orig/modules.d/90lvm/module-setup.sh dracut-047/modules.d/90lvm/module-setup.sh
+--- dracut-047.orig/modules.d/90lvm/module-setup.sh    2018-02-19 09:00:33.000000000 +0000
++++ dracut-047/modules.d/90lvm/module-setup.sh 2018-03-15 12:12:46.548976493 +0000
+@@ -73,9 +73,9 @@ install() {
          if [ -f /etc/lvm/lvmlocal.conf ]; then
              inst_simple -H /etc/lvm/lvmlocal.conf
          fi
@@ -13,16 +13,16 @@ diff -ur dracut-044.orig/modules.d/90lvm/module-setup.sh dracut-044/modules.d/90
              if [ -f "$system_id_file" ]; then
                  inst_simple -H $system_id_file
              fi
-diff -ur dracut-044.orig/modules.d/95terminfo/module-setup.sh dracut-044/modules.d/95terminfo/module-setup.sh
---- dracut-044.orig/modules.d/95terminfo/module-setup.sh       2015-11-25 13:22:28.000000000 +0000
-+++ dracut-044/modules.d/95terminfo/module-setup.sh    2015-11-30 13:01:38.196305000 +0000
-@@ -11,7 +11,9 @@
+diff -urpa dracut-047.orig/modules.d/95terminfo/module-setup.sh dracut-047/modules.d/95terminfo/module-setup.sh
+--- dracut-047.orig/modules.d/95terminfo/module-setup.sh       2018-02-19 09:00:33.000000000 +0000
++++ dracut-047/modules.d/95terminfo/module-setup.sh    2018-03-15 12:16:03.615974274 +0000
+@@ -11,7 +11,9 @@ install() {
      if [ -d ${_terminfodir} ]; then
          for i in "l/linux" "v/vt100" "v/vt102" "v/vt220"; do
              inst_dir "$_terminfodir/${i%/*}"
--            cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i"
+-            $DRACUT_CP -L -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i"
 +            if [ -f "${initdir}/${_terminfodir}/${i%/*}" ]; then
-+                cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i"
++                $DRACUT_CP -L -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i"
 +            fi
          done
      fi

diff --git a/no_systemd_udevd.patch b/no_systemd_udevd.patch
index e80349ac62d3da07c96c57cc58f6850d249ea85d..65f30d7f5696a065b4e3e5918102f52be1625949 100644 (file)
--- a/no_systemd_udevd.patch
+++ b/no_systemd_udevd.patch
@@ -1,7 +1,7 @@
-diff -ur dracut-044.orig/modules.d/40network/net-lib.sh dracut-044/modules.d/40network/net-lib.sh
---- dracut-044.orig/modules.d/40network/net-lib.sh     2015-11-25 13:22:28.000000000 +0000
-+++ dracut-044/modules.d/40network/net-lib.sh  2015-11-30 13:05:18.070305000 +0000
-@@ -52,7 +52,7 @@
+diff -urpa dracut-047.orig/modules.d/40network/net-lib.sh dracut-047/modules.d/40network/net-lib.sh
+--- dracut-047.orig/modules.d/40network/net-lib.sh     2018-02-19 09:00:33.000000000 +0000
++++ dracut-047/modules.d/40network/net-lib.sh  2018-03-15 12:20:15.154971442 +0000
+@@ -52,7 +52,7 @@ iface_name() {
  configured_ifaces() {
      local IFACES="" iface_id="" rv=1
      [ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces
@@ -10,10 +10,10 @@ diff -ur dracut-044.orig/modules.d/40network/net-lib.sh dracut-044/modules.d/40n
          for iface_id in $IFACES; do
              echo $(iface_name $iface_id)
              rv=0
-diff -ur dracut-044.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-044/modules.d/95iscsi/parse-iscsiroot.sh
---- dracut-044.orig/modules.d/95iscsi/parse-iscsiroot.sh       2015-11-25 13:22:28.000000000 +0000
-+++ dracut-044/modules.d/95iscsi/parse-iscsiroot.sh    2015-11-30 13:11:06.721305000 +0000
-@@ -41,7 +41,7 @@
+diff -urpa dracut-047.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-047/modules.d/95iscsi/parse-iscsiroot.sh
+--- dracut-047.orig/modules.d/95iscsi/parse-iscsiroot.sh       2018-02-19 09:00:33.000000000 +0000
++++ dracut-047/modules.d/95iscsi/parse-iscsiroot.sh    2018-03-15 12:20:15.155971442 +0000
+@@ -41,7 +41,7 @@ if [ "${root%%:*}" = "iscsi" ] ; then
      netroot=$root
      # if root is not specified try to mount the whole iSCSI LUN
      printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules
@@ -22,7 +22,7 @@ diff -ur dracut-044.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-044/modules
      root=/dev/root
  
      write_fs_tab /dev/root
-@@ -58,7 +58,7 @@
+@@ -58,7 +58,7 @@ done
  if [ "${root}" = "/dev/root" ] && getarg "netroot=dhcp" ; then
      # if root is not specified try to mount the whole iSCSI LUN
      printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules
@@ -31,10 +31,10 @@ diff -ur dracut-044.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-044/modules
  fi
  
  if [ -n "$iscsiroot" ] ; then
-diff -ur dracut-044.orig/modules.d/95udev-rules/module-setup.sh dracut-044/modules.d/95udev-rules/module-setup.sh
---- dracut-044.orig/modules.d/95udev-rules/module-setup.sh     2015-11-25 13:22:28.000000000 +0000
-+++ dracut-044/modules.d/95udev-rules/module-setup.sh  2015-11-30 13:05:18.071305000 +0000
-@@ -12,19 +12,7 @@
+diff -urpa dracut-047.orig/modules.d/95udev-rules/module-setup.sh dracut-047/modules.d/95udev-rules/module-setup.sh
+--- dracut-047.orig/modules.d/95udev-rules/module-setup.sh     2018-02-19 09:00:33.000000000 +0000
++++ dracut-047/modules.d/95udev-rules/module-setup.sh  2018-03-15 12:20:15.155971442 +0000
+@@ -12,19 +12,7 @@ install() {
      inst_multiple -o /etc/udev/udev.conf
  
      [ -d ${initdir}/$systemdutildir ] || mkdir -p ${initdir}/$systemdutildir
@@ -55,10 +55,10 @@ diff -ur dracut-044.orig/modules.d/95udev-rules/module-setup.sh dracut-044/modul
  
      inst_rules \
          40-redhat.rules \
-diff -ur dracut-044.orig/modules.d/99base/init.sh dracut-044/modules.d/99base/init.sh
---- dracut-044.orig/modules.d/99base/init.sh   2015-11-30 13:03:41.000000000 +0000
-+++ dracut-044/modules.d/99base/init.sh        2015-11-30 13:05:18.072305000 +0000
-@@ -143,7 +143,7 @@
+diff -urpa dracut-047.orig/modules.d/99base/init.sh dracut-047/modules.d/99base/init.sh
+--- dracut-047.orig/modules.d/99base/init.sh   2018-03-15 12:17:03.000000000 +0000
++++ dracut-047/modules.d/99base/init.sh        2018-03-15 12:20:15.155971442 +0000
+@@ -150,7 +150,7 @@ getargbool 0 rd.udev.info -d -y rdudevin
  getargbool 0 rd.udev.debug -d -y rdudevdebug && UDEV_LOG=debug
  
  # start up udev and trigger cold plugs

diff --git a/os-release.patch b/os-release.patch
index 3075bfddf29c62f7fd2a771bdab006b4a047c4da..53bdbdb6cf0094237fb28e5b065586960f30cfd9 100644 (file)
--- a/os-release.patch
+++ b/os-release.patch
@@ -1,12 +1,12 @@
-diff -ur dracut-044.orig/modules.d/50plymouth/plymouth-populate-initrd.sh dracut-044/modules.d/50plymouth/plymouth-populate-initrd.sh
---- dracut-044.orig/modules.d/50plymouth/plymouth-populate-initrd.sh   2015-11-25 13:22:28.000000000 +0000
-+++ dracut-044/modules.d/50plymouth/plymouth-populate-initrd.sh        2015-11-30 12:47:19.901305000 +0000
-@@ -5,7 +5,7 @@
+diff -urpa dracut-047.orig/modules.d/50plymouth/plymouth-populate-initrd.sh dracut-047/modules.d/50plymouth/plymouth-populate-initrd.sh
+--- dracut-047.orig/modules.d/50plymouth/plymouth-populate-initrd.sh   2018-02-19 09:00:33.000000000 +0000
++++ dracut-047/modules.d/50plymouth/plymouth-populate-initrd.sh        2018-03-15 12:03:37.494982675 +0000
+@@ -4,7 +4,7 @@ PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/s
+ PLYMOUTH_THEME=$(plymouth-set-default-theme)
  
  inst_multiple plymouthd plymouth \
-     "${PLYMOUTH_LOGO_FILE}" \
 -    /etc/system-release
 +    /etc/os-release
  
- mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
+ test -e "${PLYMOUTH_LOGO_FILE}" && inst_simple "${PLYMOUTH_LOGO_FILE}"
  

diff --git a/plymouth-libexec.patch b/plymouth-libexec.patch
deleted file mode 100644 (file)
index 24c4bf8..0000000
--- a/plymouth-libexec.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urN dracut-040.orig/modules.d/50plymouth/module-setup.sh dracut-040/modules.d/50plymouth/module-setup.sh
---- dracut-040.orig/modules.d/50plymouth/module-setup.sh       2014-10-24 17:41:12.966283303 +0200
-+++ dracut-040/modules.d/50plymouth/module-setup.sh    2014-10-24 17:42:58.112954942 +0200
-@@ -13,11 +13,11 @@
- 
- # called by dracut
- install() {
--    PKGLIBDIR="/usr/lib/plymouth"
-+    PKGLIBDIR="/usr/@lib@/plymouth"
-     if type -P dpkg-architecture &>/dev/null; then
-         PKGLIBDIR="/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth"
-     fi
--    [ -x /usr/libexec/plymouth/plymouth-populate-initrd ] && PKGLIBDIR="/usr/libexec/plymouth"
-+    [ -x /usr/@lib@/plymouth/plymouth-populate-initrd ] && PKGLIBDIR="/usr/@lib@/plymouth"
- 
-     if grep -q nash ${PKGLIBDIR}/plymouth-populate-initrd \
-         || [ ! -x ${PKGLIBDIR}/plymouth-populate-initrd ]; then

diff --git a/plymouth-logo.patch b/plymouth-logo.patch
deleted file mode 100644 (file)
index 30a552e..0000000
--- a/plymouth-logo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur dracut-044.orig/modules.d/50plymouth/plymouth-populate-initrd.sh dracut-044/modules.d/50plymouth/plymouth-populate-initrd.sh
---- dracut-044.orig/modules.d/50plymouth/plymouth-populate-initrd.sh   2015-11-30 12:47:19.000000000 +0000
-+++ dracut-044/modules.d/50plymouth/plymouth-populate-initrd.sh        2015-11-30 12:48:48.898305000 +0000
-@@ -4,9 +4,10 @@
- PLYMOUTH_THEME=$(plymouth-set-default-theme)
- 
- inst_multiple plymouthd plymouth \
--    "${PLYMOUTH_LOGO_FILE}" \
-     /etc/os-release
- 
-+[[ -f "${PLYMOUTH_LOGO_FILE}" ]] && inst_multiple "${PLYMOUTH_LOGO_FILE}"
-+
- mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
- 
- inst_libdir_file "plymouth/text.so" "plymouth/details.so"

diff --git a/prelink-libs.patch b/prelink-libs.patch
index 72390294c45d07cd3e4f810265b5ba77c3f92c3f..582189402105e7f951bd81a42404a882e67d59b4 100644 (file)
--- a/prelink-libs.patch
+++ b/prelink-libs.patch
@@ -1,8 +1,8 @@
-diff -ur dracut-044.orig/dracut.sh dracut-044/dracut.sh
---- dracut-044.orig/dracut.sh  2015-11-25 13:22:28.000000000 +0000
-+++ dracut-044/dracut.sh       2015-11-30 12:50:20.168305000 +0000
-@@ -1554,10 +1554,10 @@
- if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then
+diff -urpa dracut-047.orig/dracut.sh dracut-047/dracut.sh
+--- dracut-047.orig/dracut.sh  2018-02-19 09:00:33.000000000 +0000
++++ dracut-047/dracut.sh       2018-03-15 12:07:49.777979834 +0000
+@@ -1612,10 +1612,10 @@ PRELINK_BIN="$(command -v prelink)"
+ if [[ $EUID = 0 ]] && [[ $PRELINK_BIN ]]; then
      if [[ $DRACUT_FIPS_MODE ]]; then
          dinfo "*** Installing prelink files ***"
 -        inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache

diff --git a/proc_sys_remount.patch b/proc_sys_remount.patch
index ca4ee928839cf5ffe38528d3ac8ad83159d623ec..38b2ef4424fa32db468492252c986465b85cf295 100644 (file)
--- a/proc_sys_remount.patch
+++ b/proc_sys_remount.patch
@@ -1,7 +1,7 @@
-diff -ur dracut-044.orig/modules.d/99base/init.sh dracut-044/modules.d/99base/init.sh
---- dracut-044.orig/modules.d/99base/init.sh   2015-11-25 13:22:28.000000000 +0000
-+++ dracut-044/modules.d/99base/init.sh        2015-11-30 13:00:40.396305000 +0000
-@@ -269,6 +269,26 @@
+diff -urpa dracut-047.orig/modules.d/99base/init.sh dracut-047/modules.d/99base/init.sh
+--- dracut-047.orig/modules.d/99base/init.sh   2018-02-19 09:00:33.000000000 +0000
++++ dracut-047/modules.d/99base/init.sh        2018-03-15 12:11:57.060977050 +0000
+@@ -277,6 +277,26 @@ getarg 'rd.break=cleanup' -d 'rdbreak=cl
  source_hook cleanup
  
  # By the time we get here, the root filesystem should be mounted.