- updated to 0.47, partial PLD merge

[packages/dracut.git] / no_systemd_udevd.patch

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