diff options
| author |   William Hubbs <williamh@gentoo.org> | 2011-12-08 21:38:04 -0600 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2011-12-08 21:38:04 -0600 |
| commit | 573cf60eb9c4aa99a22f0cb9decae3a23010fd5c (patch) | |
| tree | 9455ed3a1172faaf100d4136585a51ee181bb329 | |
| parent | Release udev-gentoo-scripts-5 (diff) | |
| download | udev-gentoo-scripts-573cf60eb9c4aa99a22f0cb9decae3a23010fd5c.tar.gz udev-gentoo-scripts-573cf60eb9c4aa99a22f0cb9decae3a23010fd5c.tar.bz2 udev-gentoo-scripts-573cf60eb9c4aa99a22f0cb9decae3a23010fd5c.zip | |
Make udev-postmount work correctly for all versions of udev
Udev-postmount can use udevadm --version to determine which version of
udev is running, so we should use that to determine when to run
udevadm trigger --type=failed instead of dropping it entirely.
| -rw-r--r-- | init.d/udev-postmount | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/init.d/udev-postmount b/init.d/udev-postmount index 22e2582..41c14c1 100644 --- a/init.d/udev-postmount +++ b/init.d/udev-postmount @@ -1,11 +1,18 @@ #!/sbin/runscript # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/164/udev-postmount.initd,v 1.1 2010/10/30 13:53:54 zzam Exp $ + +udev_version() +{ + echo $(udevadm --version) +} depend() { need localmount + if [ $(udev_version) -lt 175 ]; then + after dbus # for trigger failed + fi } dir_writeable() @@ -32,7 +39,6 @@ store_persistent_rules() done } - start() { RUNDIR=$(udevadm info --run) @@ -41,6 +47,11 @@ start() einfo "Doing udev cleanups" + if [ $(udev_version) -lt 175 ]; then + # Run the events that failed at first udev trigger + udevadm trigger --type=failed -v + fi + # store persistent-rules that got created while booting # when / was still read-only store_persistent_rules |