]> TLD Linux GIT Repositories - packages/dracut.git/blob - no_systemd_udevd.patch
- don't link udevd as systemd-udevd
[packages/dracut.git] / no_systemd_udevd.patch
1 diff -ur dracut-043.orig/modules.d/40network/net-lib.sh dracut-043/modules.d/40network/net-lib.sh
2 --- dracut-043.orig/modules.d/40network/net-lib.sh      2015-06-15 10:27:21.000000000 +0000
3 +++ dracut-043/modules.d/40network/net-lib.sh   2015-08-07 17:43:11.628527800 +0000
4 @@ -39,7 +39,7 @@
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 -ur dracut-043.orig/modules.d/95udev-rules/module-setup.sh dracut-043/modules.d/95udev-rules/module-setup.sh
14 --- dracut-043.orig/modules.d/95udev-rules/module-setup.sh      2015-06-15 10:27:21.000000000 +0000
15 +++ dracut-043/modules.d/95udev-rules/module-setup.sh   2015-08-07 17:44:57.498527800 +0000
16 @@ -12,19 +12,7 @@
17      inst_multiple -o /etc/udev/udev.conf
18  
19      [ -d ${initdir}/$systemdutildir ] || mkdir -p ${initdir}/$systemdutildir
20 -    for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /sbin/udevd; do
21 -        [ -x "$_i" ] || continue
22 -        inst "$_i"
23 -
24 -        if ! [[ -f  ${initdir}${systemdutildir}/systemd-udevd ]]; then
25 -            ln -fs "$_i" ${initdir}${systemdutildir}/systemd-udevd
26 -        fi
27 -        break
28 -    done
29 -    if ! [[ -e ${initdir}${systemdutildir}/systemd-udevd ]]; then
30 -        derror "Cannot find [systemd-]udevd binary!"
31 -        exit 1
32 -    fi
33 +    inst /sbin/udevd;
34  
35      inst_rules \
36          50-firmware.rules \
37 diff -ur dracut-043.orig/modules.d/99base/init.sh dracut-043/modules.d/99base/init.sh
38 --- dracut-043.orig/modules.d/99base/init.sh    2015-08-07 17:01:00.000000000 +0000
39 +++ dracut-043/modules.d/99base/init.sh 2015-08-07 17:42:52.207527800 +0000
40 @@ -143,7 +143,7 @@
41  getargbool 0 rd.udev.debug -d -y rdudevdebug && UDEV_LOG=debug
42  
43  # start up udev and trigger cold plugs
44 -UDEV_LOG=$UDEV_LOG $systemdutildir/systemd-udevd --daemon --resolve-names=never
45 +UDEV_LOG=$UDEV_LOG /sbin/udevd --daemon --resolve-names=never
46  
47  UDEV_QUEUE_EMPTY="udevadm settle --timeout=0"
48