- updated systemd clenaup

[packages/dracut.git] / no_systemd_udevd.patch

diff --git a/no_systemd_udevd.patch b/no_systemd_udevd.patch
index ebd33a11bf698b69f440fda45f218fc69ed49157..65f30d7f5696a065b4e3e5918102f52be1625949 100644 (file)
--- a/no_systemd_udevd.patch
+++ b/no_systemd_udevd.patch
@@ -1,7 +1,7 @@
-diff -ur dracut-043.orig/modules.d/40network/net-lib.sh dracut-043/modules.d/40network/net-lib.sh
---- dracut-043.orig/modules.d/40network/net-lib.sh     2015-06-15 10:27:21.000000000 +0000
-+++ dracut-043/modules.d/40network/net-lib.sh  2015-08-07 17:43:11.628527800 +0000
-@@ -39,7 +39,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,31 @@ diff -ur dracut-043.orig/modules.d/40network/net-lib.sh dracut-043/modules.d/40n
          for iface_id in $IFACES; do
              echo $(iface_name $iface_id)
              rv=0
-diff -ur dracut-043.orig/modules.d/95udev-rules/module-setup.sh dracut-043/modules.d/95udev-rules/module-setup.sh
---- dracut-043.orig/modules.d/95udev-rules/module-setup.sh     2015-06-15 10:27:21.000000000 +0000
-+++ dracut-043/modules.d/95udev-rules/module-setup.sh  2015-08-07 17:44:57.498527800 +0000
-@@ -12,19 +12,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
+-    [ -n "$DRACUT_SYSTEMD" ] && systemctl is-active systemd-udevd && udevadm control --reload-rules
++    udevadm control --reload-rules
+     root=/dev/root
+ 
+     write_fs_tab /dev/root
+@@ -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
+-    [ -n "$DRACUT_SYSTEMD" ] && systemctl is-active systemd-udevd && udevadm control --reload-rules
++    udevadm control --reload-rules
+ fi
+ 
+ if [ -n "$iscsiroot" ] ; then
+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
@@ -33,11 +54,11 @@ diff -ur dracut-043.orig/modules.d/95udev-rules/module-setup.sh dracut-043/modul
 +    inst /sbin/udevd;
  
      inst_rules \
-         50-firmware.rules \
-diff -ur dracut-043.orig/modules.d/99base/init.sh dracut-043/modules.d/99base/init.sh
---- dracut-043.orig/modules.d/99base/init.sh   2015-08-07 17:01:00.000000000 +0000
-+++ dracut-043/modules.d/99base/init.sh        2015-08-07 17:42:52.207527800 +0000
-@@ -143,7 +143,7 @@
+         40-redhat.rules \
+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