- remove systemd stuff completly, cleanup

[packages/dracut.git] / no_systemd_udevd.patch

diff --git a/no_systemd_udevd.patch b/no_systemd_udevd.patch
deleted file mode 100644 (file)
index 65f30d7..0000000
--- a/no_systemd_udevd.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-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
--    if { pidof udevd || pidof systemd-udevd; } > /dev/null; then
-+    if { pidof udevd; } > /dev/null; then
-         for iface_id in $IFACES; do
-             echo $(iface_name $iface_id)
-             rv=0
-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
--    for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /sbin/udevd; do
--        [ -x "$_i" ] || continue
--        inst "$_i"
--
--        if ! [[ -f  ${initdir}${systemdutildir}/systemd-udevd ]]; then
--            ln -fs "$_i" ${initdir}${systemdutildir}/systemd-udevd
--        fi
--        break
--    done
--    if ! [[ -e ${initdir}${systemdutildir}/systemd-udevd ]]; then
--        derror "Cannot find [systemd-]udevd binary!"
--        exit 1
--    fi
-+    inst /sbin/udevd;
- 
-     inst_rules \
-         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
--UDEV_LOG=$UDEV_LOG $systemdutildir/systemd-udevd --daemon --resolve-names=never
-+UDEV_LOG=$UDEV_LOG /sbin/udevd --daemon --resolve-names=never
- 
- UDEV_QUEUE_EMPTY="udevadm settle --timeout=0"
-