]> TLD Linux GIT Repositories - packages/dracut.git/commitdiff
- remove systemd stuff as last patch
authorMarcin Krol <hawk@tld-linux.org>
Sat, 21 Jul 2018 21:01:28 +0000 (21:01 +0000)
committerMarcin Krol <hawk@tld-linux.org>
Sat, 21 Jul 2018 21:01:28 +0000 (21:01 +0000)
dracut.spec
no_systemd.patch

index 82010e183756e287a1e5eee1715a61ca2e44b144..971cb0cd6cad69c135af98c859d8451d7b85acf6 100644 (file)
@@ -16,8 +16,8 @@ Patch4:               compressors.patch
 Patch5:                proc_sys_remount.patch
 Patch6:                misc_fixes.patch
 Patch7:                initrd-release.patch
-Patch8:                no_systemd.patch
-Patch9:                crypttab-keyscript.patch
+Patch8:                crypttab-keyscript.patch
+Patch100:      no_systemd.patch
 URL:           https://dracut.wiki.kernel.org/
 BuildRequires: asciidoc
 BuildRequires: dash
@@ -185,7 +185,8 @@ Bashowe dopeÅ‚nianie skÅ‚adni dla polecenia dracut.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
+
+%patch100 -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
index 3f1a4dec52ec5bfd26bb70a4c593ae7be1209a37..4250532e6beb69cf08438c833365bb864d758aac 100644 (file)
@@ -1,6 +1,6 @@
 diff -urpa dracut-048.orig/dracut-logger.sh dracut-048/dracut-logger.sh
 --- dracut-048.orig/dracut-logger.sh   2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/dracut-logger.sh        2018-07-21 20:26:36.646212790 +0000
++++ dracut-048/dracut-logger.sh        2018-07-21 21:00:11.629092688 +0000
 @@ -144,16 +144,7 @@ dlog_init() {
      fi
  
@@ -20,8 +20,8 @@ diff -urpa dracut-048.orig/dracut-logger.sh dracut-048/dracut-logger.sh
              kmsgloglvl=$sysloglvl
              sysloglvl=0
 diff -urpa dracut-048.orig/dracut.sh dracut-048/dracut.sh
---- dracut-048.orig/dracut.sh  2018-07-21 20:22:15.812228337 +0000
-+++ dracut-048/dracut.sh       2018-07-21 20:45:51.059143982 +0000
+--- dracut-048.orig/dracut.sh  2018-07-21 20:59:45.490094246 +0000
++++ dracut-048/dracut.sh       2018-07-21 21:00:11.630092687 +0000
 @@ -1077,8 +1077,7 @@ if [[ ! $print_cmdline ]]; then
  
          if ! [[ -s $uefi_stub ]]; then
@@ -120,7 +120,7 @@ diff -urpa dracut-048.orig/dracut.sh dracut-048/dracut.sh
  exit 0
 diff -urpa dracut-048.orig/modules.d/02caps/module-setup.sh dracut-048/modules.d/02caps/module-setup.sh
 --- dracut-048.orig/modules.d/02caps/module-setup.sh   2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/02caps/module-setup.sh        2018-07-21 20:22:31.907227377 +0000
++++ dracut-048/modules.d/02caps/module-setup.sh        2018-07-21 21:00:11.630092687 +0000
 @@ -13,13 +13,9 @@ depends() {
  
  # called by dracut
@@ -141,7 +141,7 @@ diff -urpa dracut-048.orig/modules.d/02caps/module-setup.sh dracut-048/modules.d
  
 diff -urpa dracut-048.orig/modules.d/04watchdog/module-setup.sh dracut-048/modules.d/04watchdog/module-setup.sh
 --- dracut-048.orig/modules.d/04watchdog/module-setup.sh       2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/04watchdog/module-setup.sh    2018-07-21 20:22:31.907227377 +0000
++++ dracut-048/modules.d/04watchdog/module-setup.sh    2018-07-21 21:00:11.630092687 +0000
 @@ -12,21 +12,17 @@ depends() {
  
  # called by dracut
@@ -177,7 +177,7 @@ diff -urpa dracut-048.orig/modules.d/04watchdog/module-setup.sh dracut-048/modul
  }
 diff -urpa dracut-048.orig/modules.d/10i18n/console_init.sh dracut-048/modules.d/10i18n/console_init.sh
 --- dracut-048.orig/modules.d/10i18n/console_init.sh   2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/10i18n/console_init.sh        2018-07-21 20:22:31.907227377 +0000
++++ dracut-048/modules.d/10i18n/console_init.sh        2018-07-21 21:00:11.630092687 +0000
 @@ -1,11 +1,5 @@
  #!/bin/sh
  
@@ -192,7 +192,7 @@ diff -urpa dracut-048.orig/modules.d/10i18n/console_init.sh dracut-048/modules.d
  DEFAULT_FONT=LatArCyrHeb-16
 diff -urpa dracut-048.orig/modules.d/10i18n/module-setup.sh dracut-048/modules.d/10i18n/module-setup.sh
 --- dracut-048.orig/modules.d/10i18n/module-setup.sh   2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/10i18n/module-setup.sh        2018-07-21 20:22:31.908227377 +0000
++++ dracut-048/modules.d/10i18n/module-setup.sh        2018-07-21 21:00:11.630092687 +0000
 @@ -16,12 +16,6 @@ depends() {
  
  # called by dracut
@@ -247,7 +247,7 @@ diff -urpa dracut-048.orig/modules.d/10i18n/module-setup.sh dracut-048/modules.d
      }
 diff -urpa dracut-048.orig/modules.d/40network/net-lib.sh dracut-048/modules.d/40network/net-lib.sh
 --- dracut-048.orig/modules.d/40network/net-lib.sh     2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/40network/net-lib.sh  2018-07-21 20:22:31.908227377 +0000
++++ dracut-048/modules.d/40network/net-lib.sh  2018-07-21 21:00:11.630092687 +0000
 @@ -52,7 +52,7 @@ iface_name() {
  configured_ifaces() {
      local IFACES="" iface_id="" rv=1
@@ -259,7 +259,7 @@ diff -urpa dracut-048.orig/modules.d/40network/net-lib.sh dracut-048/modules.d/4
              rv=0
 diff -urpa dracut-048.orig/modules.d/50plymouth/module-setup.sh dracut-048/modules.d/50plymouth/module-setup.sh
 --- dracut-048.orig/modules.d/50plymouth/module-setup.sh       2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/50plymouth/module-setup.sh    2018-07-21 20:22:31.908227377 +0000
++++ dracut-048/modules.d/50plymouth/module-setup.sh    2018-07-21 21:00:11.631092687 +0000
 @@ -41,9 +41,7 @@ install() {
  
      inst_multiple readlink
@@ -274,7 +274,7 @@ diff -urpa dracut-048.orig/modules.d/50plymouth/module-setup.sh dracut-048/modul
  
 diff -urpa dracut-048.orig/modules.d/50plymouth/plymouth-newroot.sh dracut-048/modules.d/50plymouth/plymouth-newroot.sh
 --- dracut-048.orig/modules.d/50plymouth/plymouth-newroot.sh   2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/50plymouth/plymouth-newroot.sh        2018-07-21 20:22:31.908227377 +0000
++++ dracut-048/modules.d/50plymouth/plymouth-newroot.sh        2018-07-21 21:00:11.631092687 +0000
 @@ -1,5 +1,5 @@
  #!/bin/sh
  
@@ -284,7 +284,7 @@ diff -urpa dracut-048.orig/modules.d/50plymouth/plymouth-newroot.sh dracut-048/m
  fi
 diff -urpa dracut-048.orig/modules.d/50plymouth/plymouth-pretrigger.sh dracut-048/modules.d/50plymouth/plymouth-pretrigger.sh
 --- dracut-048.orig/modules.d/50plymouth/plymouth-pretrigger.sh        2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/50plymouth/plymouth-pretrigger.sh     2018-07-21 20:22:31.908227377 +0000
++++ dracut-048/modules.d/50plymouth/plymouth-pretrigger.sh     2018-07-21 21:00:11.631092687 +0000
 @@ -1,6 +1,6 @@
  #!/bin/sh
  
@@ -295,7 +295,7 @@ diff -urpa dracut-048.orig/modules.d/50plymouth/plymouth-pretrigger.sh dracut-04
          udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
 diff -urpa dracut-048.orig/modules.d/90btrfs/module-setup.sh dracut-048/modules.d/90btrfs/module-setup.sh
 --- dracut-048.orig/modules.d/90btrfs/module-setup.sh  2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/90btrfs/module-setup.sh       2018-07-21 20:22:31.908227377 +0000
++++ dracut-048/modules.d/90btrfs/module-setup.sh       2018-07-21 21:00:11.631092687 +0000
 @@ -42,9 +42,7 @@ install() {
          esac
      fi
@@ -309,7 +309,7 @@ diff -urpa dracut-048.orig/modules.d/90btrfs/module-setup.sh dracut-048/modules.
      inst $(command -v btrfs) /sbin/btrfs
 diff -urpa dracut-048.orig/modules.d/90crypt/crypt-run-generator.sh dracut-048/modules.d/90crypt/crypt-run-generator.sh
 --- dracut-048.orig/modules.d/90crypt/crypt-run-generator.sh   2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/90crypt/crypt-run-generator.sh        2018-07-21 20:22:31.908227377 +0000
++++ dracut-048/modules.d/90crypt/crypt-run-generator.sh        2018-07-21 21:00:11.631092687 +0000
 @@ -24,8 +24,4 @@ fi
  
  echo "$luks $dev - timeout=0,$allowdiscards" >> /etc/crypttab
@@ -320,8 +320,8 @@ diff -urpa dracut-048.orig/modules.d/90crypt/crypt-run-generator.sh dracut-048/m
 -fi
  exit 0
 diff -urpa dracut-048.orig/modules.d/90crypt/module-setup.sh dracut-048/modules.d/90crypt/module-setup.sh
---- dracut-048.orig/modules.d/90crypt/module-setup.sh  2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/90crypt/module-setup.sh       2018-07-21 20:22:31.909227377 +0000
+--- dracut-048.orig/modules.d/90crypt/module-setup.sh  2018-07-21 20:59:45.494094245 +0000
++++ dracut-048/modules.d/90crypt/module-setup.sh       2018-07-21 21:00:11.631092687 +0000
 @@ -4,7 +4,7 @@
  check() {
      local _rootdev
@@ -350,7 +350,7 @@ diff -urpa dracut-048.orig/modules.d/90crypt/module-setup.sh dracut-048/modules.
  
      if [[ $hostonly ]] && [[ -f /etc/crypttab ]]; then
          # filter /etc/crypttab for the devices we need
-@@ -119,17 +117,5 @@ install() {
+@@ -135,17 +133,5 @@ install() {
  
      inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"
  
@@ -370,7 +370,7 @@ diff -urpa dracut-048.orig/modules.d/90crypt/module-setup.sh dracut-048/modules.
  }
 diff -urpa dracut-048.orig/modules.d/90crypt/parse-crypt.sh dracut-048/modules.d/90crypt/parse-crypt.sh
 --- dracut-048.orig/modules.d/90crypt/parse-crypt.sh   2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/90crypt/parse-crypt.sh        2018-07-21 20:22:31.909227377 +0000
++++ dracut-048/modules.d/90crypt/parse-crypt.sh        2018-07-21 21:00:11.631092687 +0000
 @@ -40,12 +40,6 @@ else
      LUKS=$(getargs rd.luks.uuid -d rd_LUKS_UUID)
      tout=$(getarg rd.luks.key.tout)
@@ -513,7 +513,7 @@ diff -urpa dracut-048.orig/modules.d/90crypt/parse-crypt.sh dracut-048/modules.d
      echo 'LABEL="luks_end"' >> /etc/udev/rules.d/70-luks.rules.new
 diff -urpa dracut-048.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh dracut-048/modules.d/90dmsquash-live/dmsquash-live-root.sh
 --- dracut-048.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh    2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/90dmsquash-live/dmsquash-live-root.sh 2018-07-21 20:51:34.330123521 +0000
++++ dracut-048/modules.d/90dmsquash-live/dmsquash-live-root.sh 2018-07-21 21:00:11.632092687 +0000
 @@ -41,12 +41,7 @@ fi
  getarg rd.live.check -d check || check=""
  if [ -n "$check" ]; then
@@ -635,7 +635,7 @@ diff -urpa dracut-048.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh dracu
  
 diff -urpa dracut-048.orig/modules.d/90dmsquash-live/iso-scan.sh dracut-048/modules.d/90dmsquash-live/iso-scan.sh
 --- dracut-048.orig/modules.d/90dmsquash-live/iso-scan.sh      2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/90dmsquash-live/iso-scan.sh   2018-07-21 20:50:13.809128320 +0000
++++ dracut-048/modules.d/90dmsquash-live/iso-scan.sh   2018-07-21 21:00:11.632092687 +0000
 @@ -16,7 +16,7 @@ do_iso_scan() {
      local _name
      local dev
@@ -647,7 +647,7 @@ diff -urpa dracut-048.orig/modules.d/90dmsquash-live/iso-scan.sh dracut-048/modu
          mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
 diff -urpa dracut-048.orig/modules.d/90dmsquash-live/module-setup.sh dracut-048/modules.d/90dmsquash-live/module-setup.sh
 --- dracut-048.orig/modules.d/90dmsquash-live/module-setup.sh  2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/90dmsquash-live/module-setup.sh       2018-07-21 20:22:31.909227377 +0000
++++ dracut-048/modules.d/90dmsquash-live/module-setup.sh       2018-07-21 21:00:11.632092687 +0000
 @@ -31,9 +31,7 @@ install() {
      inst_hook pre-pivot 20 "$moddir/apply-live-updates.sh"
      inst_script "$moddir/dmsquash-live-root.sh" "/sbin/dmsquash-live-root"
@@ -660,7 +660,7 @@ diff -urpa dracut-048.orig/modules.d/90dmsquash-live/module-setup.sh dracut-048/
  }
 diff -urpa dracut-048.orig/modules.d/90kernel-modules/module-setup.sh dracut-048/modules.d/90kernel-modules/module-setup.sh
 --- dracut-048.orig/modules.d/90kernel-modules/module-setup.sh 2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/90kernel-modules/module-setup.sh      2018-07-21 20:22:31.909227377 +0000
++++ dracut-048/modules.d/90kernel-modules/module-setup.sh      2018-07-21 21:00:11.632092687 +0000
 @@ -92,8 +92,6 @@ installkernel() {
  install() {
      inst_multiple -o /lib/modprobe.d/*.conf
@@ -673,7 +673,7 @@ diff -urpa dracut-048.orig/modules.d/90kernel-modules/module-setup.sh dracut-048
  }
 diff -urpa dracut-048.orig/modules.d/90livenet/module-setup.sh dracut-048/modules.d/90livenet/module-setup.sh
 --- dracut-048.orig/modules.d/90livenet/module-setup.sh        2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/90livenet/module-setup.sh     2018-07-21 20:22:31.910227377 +0000
++++ dracut-048/modules.d/90livenet/module-setup.sh     2018-07-21 21:00:11.632092687 +0000
 @@ -17,8 +17,5 @@ install() {
      inst_hook cmdline 29 "$moddir/parse-livenet.sh"
      inst_hook initqueue/online 95 "$moddir/fetch-liveupdate.sh"
@@ -684,8 +684,8 @@ diff -urpa dracut-048.orig/modules.d/90livenet/module-setup.sh dracut-048/module
      dracut_need_initqueue
  }
 diff -urpa dracut-048.orig/modules.d/90lvm/module-setup.sh dracut-048/modules.d/90lvm/module-setup.sh
---- dracut-048.orig/modules.d/90lvm/module-setup.sh    2018-07-21 20:22:15.814228337 +0000
-+++ dracut-048/modules.d/90lvm/module-setup.sh 2018-07-21 20:22:31.910227377 +0000
+--- dracut-048.orig/modules.d/90lvm/module-setup.sh    2018-07-21 20:59:45.491094245 +0000
++++ dracut-048/modules.d/90lvm/module-setup.sh 2018-07-21 21:00:11.632092687 +0000
 @@ -97,15 +97,8 @@ install() {
  
      # Do not run lvmetad update via pvscan in udev rule  - lvmetad is not running yet in dracut!
@@ -706,7 +706,7 @@ diff -urpa dracut-048.orig/modules.d/90lvm/module-setup.sh dracut-048/modules.d/
      # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
 diff -urpa dracut-048.orig/modules.d/90mdraid/module-setup.sh dracut-048/modules.d/90mdraid/module-setup.sh
 --- dracut-048.orig/modules.d/90mdraid/module-setup.sh 2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/90mdraid/module-setup.sh      2018-07-21 20:22:31.910227377 +0000
++++ dracut-048/modules.d/90mdraid/module-setup.sh      2018-07-21 21:00:11.633092687 +0000
 @@ -126,17 +126,6 @@ install() {
      inst_hook shutdown 30 "$moddir/md-shutdown.sh"
      inst_script "$moddir/mdraid-cleanup.sh" /sbin/mdraid-cleanup
@@ -727,7 +727,7 @@ diff -urpa dracut-048.orig/modules.d/90mdraid/module-setup.sh dracut-048/modules
  }
 diff -urpa dracut-048.orig/modules.d/90multipath/module-setup.sh dracut-048/modules.d/90multipath/module-setup.sh
 --- dracut-048.orig/modules.d/90multipath/module-setup.sh      2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/90multipath/module-setup.sh   2018-07-21 20:22:31.910227377 +0000
++++ dracut-048/modules.d/90multipath/module-setup.sh   2018-07-21 21:00:11.633092687 +0000
 @@ -107,14 +107,8 @@ install() {
          [[ $_conf ]] && echo "$_conf" >> "${initdir}/etc/cmdline.d/90multipath.conf"
      fi
@@ -747,7 +747,7 @@ diff -urpa dracut-048.orig/modules.d/90multipath/module-setup.sh dracut-048/modu
      inst_hook shutdown  20 "$moddir/multipath-shutdown.sh"
 diff -urpa dracut-048.orig/modules.d/90qemu/module-setup.sh dracut-048/modules.d/90qemu/module-setup.sh
 --- dracut-048.orig/modules.d/90qemu/module-setup.sh   2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/90qemu/module-setup.sh        2018-07-21 20:22:31.910227377 +0000
++++ dracut-048/modules.d/90qemu/module-setup.sh        2018-07-21 21:00:11.633092687 +0000
 @@ -3,14 +3,6 @@
  # called by dracut
  check() {
@@ -765,7 +765,7 @@ diff -urpa dracut-048.orig/modules.d/90qemu/module-setup.sh dracut-048/modules.d
              read vendor < $i
 diff -urpa dracut-048.orig/modules.d/90qemu-net/module-setup.sh dracut-048/modules.d/90qemu-net/module-setup.sh
 --- dracut-048.orig/modules.d/90qemu-net/module-setup.sh       2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/90qemu-net/module-setup.sh    2018-07-21 20:22:31.910227377 +0000
++++ dracut-048/modules.d/90qemu-net/module-setup.sh    2018-07-21 21:00:11.633092687 +0000
 @@ -3,14 +3,6 @@
  # called by dracut
  check() {
@@ -783,7 +783,7 @@ diff -urpa dracut-048.orig/modules.d/90qemu-net/module-setup.sh dracut-048/modul
              read vendor < $i
 diff -urpa dracut-048.orig/modules.d/90stratis/module-setup.sh dracut-048/modules.d/90stratis/module-setup.sh
 --- dracut-048.orig/modules.d/90stratis/module-setup.sh        2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/90stratis/module-setup.sh     2018-07-21 20:22:31.910227377 +0000
++++ dracut-048/modules.d/90stratis/module-setup.sh     2018-07-21 21:00:11.633092687 +0000
 @@ -22,13 +22,7 @@ install() {
  
      inst_multiple stratisd-init thin_check thin_repair
@@ -802,7 +802,7 @@ diff -urpa dracut-048.orig/modules.d/90stratis/module-setup.sh dracut-048/module
  
 diff -urpa dracut-048.orig/modules.d/95debug/module-setup.sh dracut-048/modules.d/95debug/module-setup.sh
 --- dracut-048.orig/modules.d/95debug/module-setup.sh  2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/95debug/module-setup.sh       2018-07-21 20:22:31.911227377 +0000
++++ dracut-048/modules.d/95debug/module-setup.sh       2018-07-21 21:00:11.633092687 +0000
 @@ -15,7 +15,7 @@ depends() {
  install() {
      inst_multiple -o cat ls ps grep more cat rm strace free showmount \
@@ -814,7 +814,7 @@ diff -urpa dracut-048.orig/modules.d/95debug/module-setup.sh dracut-048/modules.
      grep '^tcpdump:' /etc/passwd 2>/dev/null >> "$initdir/etc/passwd"
 diff -urpa dracut-048.orig/modules.d/95fcoe/cleanup-fcoe.sh dracut-048/modules.d/95fcoe/cleanup-fcoe.sh
 --- dracut-048.orig/modules.d/95fcoe/cleanup-fcoe.sh   2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/95fcoe/cleanup-fcoe.sh        2018-07-21 20:22:31.911227377 +0000
++++ dracut-048/modules.d/95fcoe/cleanup-fcoe.sh        2018-07-21 21:00:11.633092687 +0000
 @@ -4,11 +4,7 @@
  
  if [ -e /var/run/lldpad.pid ]; then
@@ -832,7 +832,7 @@ diff -urpa dracut-048.orig/modules.d/95fcoe/cleanup-fcoe.sh dracut-048/modules.d
  fi
 diff -urpa dracut-048.orig/modules.d/95fstab-sys/mount-sys.sh dracut-048/modules.d/95fstab-sys/mount-sys.sh
 --- dracut-048.orig/modules.d/95fstab-sys/mount-sys.sh 2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/95fstab-sys/mount-sys.sh      2018-07-21 20:22:31.911227377 +0000
++++ dracut-048/modules.d/95fstab-sys/mount-sys.sh      2018-07-21 21:00:11.633092687 +0000
 @@ -25,11 +25,7 @@ fstab_mount() {
      return 0
  }
@@ -848,7 +848,7 @@ diff -urpa dracut-048.orig/modules.d/95fstab-sys/mount-sys.sh dracut-048/modules
  if [ -f $NEWROOT/etc/fstab.sys ]; then
 diff -urpa dracut-048.orig/modules.d/95iscsi/cleanup-iscsi.sh dracut-048/modules.d/95iscsi/cleanup-iscsi.sh
 --- dracut-048.orig/modules.d/95iscsi/cleanup-iscsi.sh 2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/95iscsi/cleanup-iscsi.sh      2018-07-21 20:22:31.911227377 +0000
++++ dracut-048/modules.d/95iscsi/cleanup-iscsi.sh      2018-07-21 21:00:11.634092687 +0000
 @@ -1,4 +1,4 @@
  #!/bin/sh
  
@@ -857,7 +857,7 @@ diff -urpa dracut-048.orig/modules.d/95iscsi/cleanup-iscsi.sh dracut-048/modules
  
 diff -urpa dracut-048.orig/modules.d/95iscsi/iscsiroot.sh dracut-048/modules.d/95iscsi/iscsiroot.sh
 --- dracut-048.orig/modules.d/95iscsi/iscsiroot.sh     2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/95iscsi/iscsiroot.sh  2018-07-21 20:47:30.720138041 +0000
++++ dracut-048/modules.d/95iscsi/iscsiroot.sh  2018-07-21 21:00:11.634092687 +0000
 @@ -36,7 +36,7 @@ iroot=${iroot#:}
  # figured out a way how to check whether this is built-in or not
  modprobe crc32c 2>/dev/null
@@ -934,7 +934,7 @@ diff -urpa dracut-048.orig/modules.d/95iscsi/iscsiroot.sh dracut-048/modules.d/9
          [ -f /tmp/session-retry ] || echo 1 > /tmp/session-retry
 diff -urpa dracut-048.orig/modules.d/95iscsi/module-setup.sh dracut-048/modules.d/95iscsi/module-setup.sh
 --- dracut-048.orig/modules.d/95iscsi/module-setup.sh  2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/95iscsi/module-setup.sh       2018-07-21 20:22:31.911227377 +0000
++++ dracut-048/modules.d/95iscsi/module-setup.sh       2018-07-21 21:00:11.634092687 +0000
 @@ -208,17 +208,6 @@ install() {
      inst_libdir_file 'libgcc_s.so*'
      inst_multiple umount hostname iscsi-iname iscsiadm iscsid
@@ -997,7 +997,7 @@ diff -urpa dracut-048.orig/modules.d/95iscsi/module-setup.sh dracut-048/modules.
  }
 diff -urpa dracut-048.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-048/modules.d/95iscsi/parse-iscsiroot.sh
 --- dracut-048.orig/modules.d/95iscsi/parse-iscsiroot.sh       2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/95iscsi/parse-iscsiroot.sh    2018-07-21 20:22:31.912227377 +0000
++++ dracut-048/modules.d/95iscsi/parse-iscsiroot.sh    2018-07-21 21:00:11.634092687 +0000
 @@ -41,7 +41,7 @@ if [ "${root%%:*}" = "iscsi" ] ; then
      netroot=$root
      # if root is not specified try to mount the whole iSCSI LUN
@@ -1042,7 +1042,7 @@ diff -urpa dracut-048.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-048/modul
  
 diff -urpa dracut-048.orig/modules.d/95nbd/module-setup.sh dracut-048/modules.d/95nbd/module-setup.sh
 --- dracut-048.orig/modules.d/95nbd/module-setup.sh    2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/95nbd/module-setup.sh 2018-07-21 20:22:31.912227377 +0000
++++ dracut-048/modules.d/95nbd/module-setup.sh 2018-07-21 21:00:11.634092687 +0000
 @@ -34,9 +34,6 @@ install() {
      inst nbd-client
      inst_hook cmdline 90 "$moddir/parse-nbdroot.sh"
@@ -1055,7 +1055,7 @@ diff -urpa dracut-048.orig/modules.d/95nbd/module-setup.sh dracut-048/modules.d/
  
 diff -urpa dracut-048.orig/modules.d/95nbd/nbdroot.sh dracut-048/modules.d/95nbd/nbdroot.sh
 --- dracut-048.orig/modules.d/95nbd/nbdroot.sh 2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/95nbd/nbdroot.sh      2018-07-21 20:22:31.912227377 +0000
++++ dracut-048/modules.d/95nbd/nbdroot.sh      2018-07-21 21:00:11.634092687 +0000
 @@ -97,37 +97,15 @@ if [ "$root" = "block:/dev/root" -o "$ro
      write_fs_tab /dev/root "$nbdfstype" "$fsopts"
      wait_for_dev -n /dev/root
@@ -1101,7 +1101,7 @@ diff -urpa dracut-048.orig/modules.d/95nbd/nbdroot.sh dracut-048/modules.d/95nbd
  # NBD doesn't emit uevents when it gets connected, so kick it
 diff -urpa dracut-048.orig/modules.d/95nbd/parse-nbdroot.sh dracut-048/modules.d/95nbd/parse-nbdroot.sh
 --- dracut-048.orig/modules.d/95nbd/parse-nbdroot.sh   2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/95nbd/parse-nbdroot.sh        2018-07-21 20:22:31.912227377 +0000
++++ dracut-048/modules.d/95nbd/parse-nbdroot.sh        2018-07-21 21:00:11.634092687 +0000
 @@ -46,11 +46,6 @@ fi
  [ "${netroot%%:*}" = "nbd" ] || return
  
@@ -1116,7 +1116,7 @@ diff -urpa dracut-048.orig/modules.d/95nbd/parse-nbdroot.sh dracut-048/modules.d
  [ -z "$server" ] && die "Argument server for nbdroot is missing"
 diff -urpa dracut-048.orig/modules.d/95nfs/module-setup.sh dracut-048/modules.d/95nfs/module-setup.sh
 --- dracut-048.orig/modules.d/95nfs/module-setup.sh    2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/95nfs/module-setup.sh 2018-07-21 20:46:52.523140318 +0000
++++ dracut-048/modules.d/95nfs/module-setup.sh 2018-07-21 21:00:11.635092687 +0000
 @@ -73,7 +73,7 @@ install() {
      local _i
      local _nsslibs
@@ -1127,8 +1127,8 @@ diff -urpa dracut-048.orig/modules.d/95nfs/module-setup.sh dracut-048/modules.d/
  
      if [[ $hostonly_cmdline == "yes" ]]; then
 diff -urpa dracut-048.orig/modules.d/95resume/module-setup.sh dracut-048/modules.d/95resume/module-setup.sh
---- dracut-048.orig/modules.d/95resume/module-setup.sh 2018-07-21 20:22:15.810228337 +0000
-+++ dracut-048/modules.d/95resume/module-setup.sh      2018-07-21 20:22:31.912227377 +0000
+--- dracut-048.orig/modules.d/95resume/module-setup.sh 2018-07-21 20:59:45.488094246 +0000
++++ dracut-048/modules.d/95resume/module-setup.sh      2018-07-21 21:00:11.635092687 +0000
 @@ -33,15 +33,6 @@ install() {
        [[ $_resumeconf ]] && printf "%s\n" "$_resumeconf" >> "${initdir}/etc/cmdline.d/95resume.conf"
      fi
@@ -1160,7 +1160,7 @@ diff -urpa dracut-048.orig/modules.d/95resume/module-setup.sh dracut-048/modules
  }
 diff -urpa dracut-048.orig/modules.d/95rootfs-block/module-setup.sh dracut-048/modules.d/95rootfs-block/module-setup.sh
 --- dracut-048.orig/modules.d/95rootfs-block/module-setup.sh   2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/95rootfs-block/module-setup.sh        2018-07-21 20:22:31.912227377 +0000
++++ dracut-048/modules.d/95rootfs-block/module-setup.sh        2018-07-21 21:00:11.635092687 +0000
 @@ -69,11 +69,9 @@ install() {
  
      inst_multiple umount
@@ -1178,7 +1178,7 @@ diff -urpa dracut-048.orig/modules.d/95rootfs-block/module-setup.sh dracut-048/m
  }
 diff -urpa dracut-048.orig/modules.d/95udev-rules/module-setup.sh dracut-048/modules.d/95udev-rules/module-setup.sh
 --- dracut-048.orig/modules.d/95udev-rules/module-setup.sh     2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/95udev-rules/module-setup.sh  2018-07-21 20:22:31.912227377 +0000
++++ dracut-048/modules.d/95udev-rules/module-setup.sh  2018-07-21 21:00:11.635092687 +0000
 @@ -11,20 +11,7 @@ install() {
      inst_dir /etc/udev
      inst_multiple -o /etc/udev/udev.conf
@@ -1215,7 +1215,7 @@ diff -urpa dracut-048.orig/modules.d/95udev-rules/module-setup.sh dracut-048/mod
              if ! grep -q "^$i:" "$initdir/etc/group" 2>/dev/null; then
 diff -urpa dracut-048.orig/modules.d/95virtfs/module-setup.sh dracut-048/modules.d/95virtfs/module-setup.sh
 --- dracut-048.orig/modules.d/95virtfs/module-setup.sh 2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/95virtfs/module-setup.sh      2018-07-21 20:22:31.913227377 +0000
++++ dracut-048/modules.d/95virtfs/module-setup.sh      2018-07-21 21:00:11.635092687 +0000
 @@ -9,14 +9,6 @@ check() {
          return 255
      }
@@ -1233,7 +1233,7 @@ diff -urpa dracut-048.orig/modules.d/95virtfs/module-setup.sh dracut-048/modules
          read vendor < $i
 diff -urpa dracut-048.orig/modules.d/98usrmount/module-setup.sh dracut-048/modules.d/98usrmount/module-setup.sh
 --- dracut-048.orig/modules.d/98usrmount/module-setup.sh       2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/98usrmount/module-setup.sh    2018-07-21 20:22:31.913227377 +0000
++++ dracut-048/modules.d/98usrmount/module-setup.sh    2018-07-21 21:00:11.635092687 +0000
 @@ -13,9 +13,7 @@ depends() {
  
  # called by dracut
@@ -1246,8 +1246,8 @@ diff -urpa dracut-048.orig/modules.d/98usrmount/module-setup.sh dracut-048/modul
  }
  
 diff -urpa dracut-048.orig/modules.d/99base/dracut-lib.sh dracut-048/modules.d/99base/dracut-lib.sh
---- dracut-048.orig/modules.d/99base/dracut-lib.sh     2018-07-21 20:22:15.815228337 +0000
-+++ dracut-048/modules.d/99base/dracut-lib.sh  2018-07-21 20:22:31.913227377 +0000
+--- dracut-048.orig/modules.d/99base/dracut-lib.sh     2018-07-21 20:59:45.493094245 +0000
++++ dracut-048/modules.d/99base/dracut-lib.sh  2018-07-21 21:00:11.636092687 +0000
 @@ -1,6 +1,5 @@
  #!/bin/sh
  
@@ -1477,8 +1477,8 @@ diff -urpa dracut-048.orig/modules.d/99base/dracut-lib.sh dracut-048/modules.d/9
  
  emergency_shell()
 diff -urpa dracut-048.orig/modules.d/99base/init.sh dracut-048/modules.d/99base/init.sh
---- dracut-048.orig/modules.d/99base/init.sh   2018-07-21 20:22:15.815228337 +0000
-+++ dracut-048/modules.d/99base/init.sh        2018-07-21 20:22:31.913227377 +0000
+--- dracut-048.orig/modules.d/99base/init.sh   2018-07-21 20:59:45.493094245 +0000
++++ dracut-048/modules.d/99base/init.sh        2018-07-21 21:00:11.636092687 +0000
 @@ -150,7 +150,7 @@ getargbool 0 rd.udev.info -d -y rdudevin
  getargbool 0 rd.udev.debug -d -y rdudevdebug && UDEV_LOG=debug
  
@@ -1490,7 +1490,7 @@ diff -urpa dracut-048.orig/modules.d/99base/init.sh dracut-048/modules.d/99base/
  
 diff -urpa dracut-048.orig/modules.d/99base/memtrace-ko.sh dracut-048/modules.d/99base/memtrace-ko.sh
 --- dracut-048.orig/modules.d/99base/memtrace-ko.sh    2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/99base/memtrace-ko.sh 2018-07-21 20:22:31.913227377 +0000
++++ dracut-048/modules.d/99base/memtrace-ko.sh 2018-07-21 21:00:11.636092687 +0000
 @@ -23,7 +23,7 @@ get_want_events() {
  }
  
@@ -1510,8 +1510,8 @@ diff -urpa dracut-048.orig/modules.d/99base/memtrace-ko.sh dracut-048/modules.d/
      # NOTE: Some kernel may not support this format of filter, anyway
      #       the operation will fail and it doesn't matter.
 diff -urpa dracut-048.orig/modules.d/99base/module-setup.sh dracut-048/modules.d/99base/module-setup.sh
---- dracut-048.orig/modules.d/99base/module-setup.sh   2018-07-21 20:22:15.816228337 +0000
-+++ dracut-048/modules.d/99base/module-setup.sh        2018-07-21 20:22:31.914227377 +0000
+--- dracut-048.orig/modules.d/99base/module-setup.sh   2018-07-21 20:59:45.493094245 +0000
++++ dracut-048/modules.d/99base/module-setup.sh        2018-07-21 21:00:11.636092687 +0000
 @@ -46,11 +46,8 @@ install() {
      inst_simple "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh"
      mkdir -p "${initdir}/var"
@@ -1541,7 +1541,7 @@ diff -urpa dracut-048.orig/modules.d/99base/module-setup.sh dracut-048/modules.d
                  . "$moddir/dracut-lib.sh"
 diff -urpa dracut-048.orig/modules.d/99fs-lib/fs-lib.sh dracut-048/modules.d/99fs-lib/fs-lib.sh
 --- dracut-048.orig/modules.d/99fs-lib/fs-lib.sh       2018-07-06 08:37:51.000000000 +0000
-+++ dracut-048/modules.d/99fs-lib/fs-lib.sh    2018-07-21 20:22:31.914227377 +0000
++++ dracut-048/modules.d/99fs-lib/fs-lib.sh    2018-07-21 21:00:11.636092687 +0000
 @@ -247,9 +247,4 @@ write_fs_tab() {
      fi