no_systemd_udevd.patch

   1 diff -urpa dracut-047.orig/modules.d/40network/net-lib.sh dracut-047/modules.d/40network/net-lib.sh
   2 --- dracut-047.orig/modules.d/40network/net-lib.sh      2018-02-19 09:00:33.000000000 +0000
   3 +++ dracut-047/modules.d/40network/net-lib.sh   2018-03-15 12:20:15.154971442 +0000
   4 @@ -52,7 +52,7 @@ iface_name() {
   5  configured_ifaces() {
   6      local IFACES="" iface_id="" rv=1
   7      [ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces
   8 -    if { pidof udevd || pidof systemd-udevd; } > /dev/null; then
   9 +    if { pidof udevd; } > /dev/null; then
  10          for iface_id in $IFACES; do
  11              echo $(iface_name $iface_id)
  12              rv=0
  13 diff -urpa dracut-047.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-047/modules.d/95iscsi/parse-iscsiroot.sh
  14 --- dracut-047.orig/modules.d/95iscsi/parse-iscsiroot.sh        2018-02-19 09:00:33.000000000 +0000
  15 +++ dracut-047/modules.d/95iscsi/parse-iscsiroot.sh     2018-03-15 12:20:15.155971442 +0000
  16 @@ -41,7 +41,7 @@ if [ "${root%%:*}" = "iscsi" ] ; then
  17      netroot=$root
  18      # if root is not specified try to mount the whole iSCSI LUN
  19      printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules
  20 -    [ -n "$DRACUT_SYSTEMD" ] && systemctl is-active systemd-udevd && udevadm control --reload-rules
  21 +    udevadm control --reload-rules
  22      root=/dev/root
  23
  24      write_fs_tab /dev/root
  25 @@ -58,7 +58,7 @@ done
  26  if [ "${root}" = "/dev/root" ] && getarg "netroot=dhcp" ; then
  27      # if root is not specified try to mount the whole iSCSI LUN
  28      printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules
  29 -    [ -n "$DRACUT_SYSTEMD" ] && systemctl is-active systemd-udevd && udevadm control --reload-rules
  30 +    udevadm control --reload-rules
  31  fi
  32
  33  if [ -n "$iscsiroot" ] ; then
  34 diff -urpa dracut-047.orig/modules.d/95udev-rules/module-setup.sh dracut-047/modules.d/95udev-rules/module-setup.sh
  35 --- dracut-047.orig/modules.d/95udev-rules/module-setup.sh      2018-02-19 09:00:33.000000000 +0000
  36 +++ dracut-047/modules.d/95udev-rules/module-setup.sh   2018-03-15 12:20:15.155971442 +0000
  37 @@ -12,19 +12,7 @@ install() {
  38      inst_multiple -o /etc/udev/udev.conf
  39
  40      [ -d ${initdir}/$systemdutildir ] || mkdir -p ${initdir}/$systemdutildir
  41 -    for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /sbin/udevd; do
  42 -        [ -x "$_i" ] || continue
  43 -        inst "$_i"
  44 -
  45 -        if ! [[ -f  ${initdir}${systemdutildir}/systemd-udevd ]]; then
  46 -            ln -fs "$_i" ${initdir}${systemdutildir}/systemd-udevd
  47 -        fi
  48 -        break
  49 -    done
  50 -    if ! [[ -e ${initdir}${systemdutildir}/systemd-udevd ]]; then
  51 -        derror "Cannot find [systemd-]udevd binary!"
  52 -        exit 1
  53 -    fi
  54 +    inst /sbin/udevd;
  55
  56      inst_rules \
  57          40-redhat.rules \
  58 diff -urpa dracut-047.orig/modules.d/99base/init.sh dracut-047/modules.d/99base/init.sh
  59 --- dracut-047.orig/modules.d/99base/init.sh    2018-03-15 12:17:03.000000000 +0000
  60 +++ dracut-047/modules.d/99base/init.sh 2018-03-15 12:20:15.155971442 +0000
  61 @@ -150,7 +150,7 @@ getargbool 0 rd.udev.info -d -y rdudevin
  62  getargbool 0 rd.udev.debug -d -y rdudevdebug && UDEV_LOG=debug
  63
  64  # start up udev and trigger cold plugs
  65 -UDEV_LOG=$UDEV_LOG $systemdutildir/systemd-udevd --daemon --resolve-names=never
  66 +UDEV_LOG=$UDEV_LOG /sbin/udevd --daemon --resolve-names=never
  67
  68  UDEV_QUEUE_EMPTY="udevadm settle --timeout=0"
  69