From c3063d0400e7a55c9dbd6ff1b76887744e9b6224 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Mon, 28 Feb 2011 10:18:08 +0800 Subject: workaround: do not set property=STARTUP=1 when calling udevadm This was needed to properly deal with dm devices being created in initrd. However, the lvm2/devicemapper rule files no longer use this property and now contain a proper fix. By grepping through /lib/udev/rules.d I could not find any other rule file using this property. Finally, the startup script submitted to systemd by the udev maintainer does not set the property, and there has not been any bug complaints about this. Signed-off-by: Tom Gundersen --- rc.sysinit | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/rc.sysinit b/rc.sysinit index 9973c25..ec5307c 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -82,7 +82,6 @@ run_hook sysinit_udevlaunched # Trigger udev uevents if /bin/pidof -o %PPID /sbin/udevd >/dev/null; then stat_busy "Triggering UDev uevents" - /sbin/udevadm control --property=STARTUP=1 /sbin/udevadm trigger --action=add --type=devices /sbin/udevadm trigger --action=add --type=subsystems stat_done @@ -99,10 +98,8 @@ unset mods # Wait for udev uevents if /bin/pidof -o %PPID /sbin/udevd >/dev/null; then - stat_busy "Waiting for UDev uevents to be processed" - /sbin/udevadm settle --quiet --timeout=${UDEV_TIMEOUT:-30} - /sbin/udevadm control --property=STARTUP= - stat_done + status "Waiting for UDev uevents to be processed" \ + /sbin/udevadm settle --quiet --timeout=${UDEV_TIMEOUT:-30} fi run_hook sysinit_udevsettled -- cgit v1.2.3