- sync udevadm trigger calls with how upstream systemd service does it

- rel 5

diff --git a/start_udev b/start_udev
index a2d20c0e1c89c0513472a1825f415d5e676063fc..17f09af7ae8694784811cb319417d86cad959455 100644 (file)
--- a/start_udev
+++ b/start_udev
@@ -125,15 +125,13 @@ if [ -f "/sys/class/tty/console/uevent" ]; then
        ret=$(( $ret + $? ))
 
        # retrigger all events
-       # Udev finds it's own way of making this dir
-       # and making it by hand makes udevsettle
-       # work forever
-       #mkdir -p /dev/.udev/queue
-       udevadm trigger
+       /sbin/udevadm trigger --type=subsystems --action=add
+       ret=$(( $ret + $? ))
+       /sbin/udevadm trigger --type=devices --action=add
        ret=$(( $ret + $? ))
 
        # wait for the events to finish
-       udevadm settle
+       /sbin/udevadm settle
        ret=$(( $ret + $? ))
 else
        echo "Kernel too old for this udev version"

diff --git a/systemd.spec b/systemd.spec
index 5d3a12840d8adc974710f2774ff510a443f13ed5..c6206f41c3a738e053a7ae40ac3b6b789382539e 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -41,7 +41,7 @@ Summary(pl.UTF-8):    systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
 Version:       197
-Release:       4
+Release:       5
 Epoch:         1
 License:       GPL v2+
 Group:         Base