[arch-projects] [PATCH 1/2] [initscripts] Change udev trigger order
Respect the order documented at udev README and systemd files. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- rc.single | 2 +- rc.sysinit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rc.single b/rc.single index b9701d5..8c3358f 100755 --- a/rc.single +++ b/rc.single @@ -20,8 +20,8 @@ if [[ $PREVLEVEL != N ]]; then 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 + /sbin/udevadm trigger --action=add --type=devices stat_done fi diff --git a/rc.sysinit b/rc.sysinit index 2262d32..dc4be58 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -90,8 +90,8 @@ run_hook sysinit_udevlaunched # Trigger udev uevents if /bin/pidof /sbin/udevd &>/dev/null; then stat_busy "Triggering UDev uevents" - /sbin/udevadm trigger --action=add --type=devices /sbin/udevadm trigger --action=add --type=subsystems + /sbin/udevadm trigger --action=add --type=devices stat_done fi -- 1.7.5
Apply same logic like in rc.sysinit (commit c3063d0400e7a55c9dbd6ff1b76887744e9b6224) Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- rc.single | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/rc.single b/rc.single index 8c3358f..06bd83c 100755 --- a/rc.single +++ b/rc.single @@ -19,7 +19,6 @@ if [[ $PREVLEVEL != N ]]; then # 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=subsystems /sbin/udevadm trigger --action=add --type=devices stat_done @@ -27,10 +26,8 @@ if [[ $PREVLEVEL != N ]]; then # 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 - /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 single_udevsettled -- 1.7.5
Thanks! Applied. On Sat, Apr 30, 2011 at 8:41 PM, Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> wrote:
Apply same logic like in rc.sysinit (commit c3063d0400e7a55c9dbd6ff1b76887744e9b6224)
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- rc.single | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/rc.single b/rc.single index 8c3358f..06bd83c 100755 --- a/rc.single +++ b/rc.single @@ -19,7 +19,6 @@ if [[ $PREVLEVEL != N ]]; then # 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=subsystems /sbin/udevadm trigger --action=add --type=devices stat_done @@ -27,10 +26,8 @@ if [[ $PREVLEVEL != N ]]; then
# 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 - /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 single_udevsettled -- 1.7.5
Thanks! Applied. On Sat, Apr 30, 2011 at 8:41 PM, Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> wrote:
Respect the order documented at udev README and systemd files.
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- rc.single | 2 +- rc.sysinit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rc.single b/rc.single index b9701d5..8c3358f 100755 --- a/rc.single +++ b/rc.single @@ -20,8 +20,8 @@ if [[ $PREVLEVEL != N ]]; then 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 + /sbin/udevadm trigger --action=add --type=devices stat_done fi
diff --git a/rc.sysinit b/rc.sysinit index 2262d32..dc4be58 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -90,8 +90,8 @@ run_hook sysinit_udevlaunched # Trigger udev uevents if /bin/pidof /sbin/udevd &>/dev/null; then stat_busy "Triggering UDev uevents" - /sbin/udevadm trigger --action=add --type=devices /sbin/udevadm trigger --action=add --type=subsystems + /sbin/udevadm trigger --action=add --type=devices stat_done fi
-- 1.7.5
participants (2)
-
Gerardo Exequiel Pozzi
-
Tom Gundersen