diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2009-01-19 17:24:30 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2009-01-19 17:24:30 +0000 |
| commit | 7e37680b3a0433ca4ed5ae2d797a86031327b509 (patch) | |
| tree | d7f25eca8705a7d5a8d84e16f4772732d215578b /sys-fs/udev | |
| parent | Version bump, disabling the ill-advised automatic module unloading. Closes bu... (diff) | |
| download | gentoo-2-7e37680b3a0433ca4ed5ae2d797a86031327b509.tar.gz gentoo-2-7e37680b3a0433ca4ed5ae2d797a86031327b509.tar.bz2 gentoo-2-7e37680b3a0433ca4ed5ae2d797a86031327b509.zip | |
No longer rely on existance of /lib/librc.so to check for openrc as this is known to fail on some (multilib) setups, Bug #252493 and others.
(Portage version: 2.1.6.6/cvs/Linux 2.6.27-gentoo-r1 i686)
Diffstat (limited to 'sys-fs/udev')
| -rw-r--r-- | sys-fs/udev/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-fs/udev/files/shell-compat-118-r3.sh | 5 | ||||
| -rw-r--r-- | sys-fs/udev/files/udev-135-r2.initd | 4 | ||||
| -rw-r--r-- | sys-fs/udev/files/udev-start-135-r3.sh | 3 |
4 files changed, 14 insertions, 6 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index d2a6fe675d99..e248caec4b15 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.435 2009/01/19 09:05:21 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.436 2009/01/19 17:24:30 zzam Exp $ + + 19 Jan 2009; Matthias Schwarzott <zzam@gentoo.org> + files/shell-compat-118-r3.sh, files/udev-135-r2.initd, + files/udev-start-135-r3.sh: + No longer rely on existance of /lib/librc.so to check for openrc as this + is known to fail on some (multilib) setups, Bug #252493 and others. 19 Jan 2009; Benedikt Böhm <hollow@gentoo.org> files/udev-135-r2.initd: fix newer udev init script inside vservers too, bug #253105 diff --git a/sys-fs/udev/files/shell-compat-118-r3.sh b/sys-fs/udev/files/shell-compat-118-r3.sh index 9d852dbe8952..d76843568091 100644 --- a/sys-fs/udev/files/shell-compat-118-r3.sh +++ b/sys-fs/udev/files/shell-compat-118-r3.sh @@ -48,15 +48,14 @@ if ! cmd_exist get_KV; then } fi +# only for baselayout-1, does exist in all openrc versions if ! cmd_exist fstabinfo; then fstabinfo() { [ "$1" = "--quiet" ] && shift local dir="$1" # only check RC_USE_FSTAB on baselayout-1 - if [ ! -e /lib/librc.so ]; then - yesno "${RC_USE_FSTAB}" || return 1 - fi + yesno "${RC_USE_FSTAB}" || return 1 # check if entry is in /etc/fstab local ret=$(gawk 'BEGIN { found="false"; } diff --git a/sys-fs/udev/files/udev-135-r2.initd b/sys-fs/udev/files/udev-135-r2.initd index c29a0494cbae..7bad67f15187 100644 --- a/sys-fs/udev/files/udev-135-r2.initd +++ b/sys-fs/udev/files/udev-135-r2.initd @@ -171,8 +171,8 @@ check_udev_works() start() { - # do not run this on too old baselayout - udev-addon is already loaded! - if [ ! -e /lib/librc.so -a -f /etc/init.d/sysfs ]; then + # do not run this on old baselayout where udev-addon gets loaded + if [ ! -f /etc/init.d/sysfs ]; then eerror "The $SVCNAME init-script is written for baselayout-2!" eerror "Please do not use it with baselayout-1!". return 1 diff --git a/sys-fs/udev/files/udev-start-135-r3.sh b/sys-fs/udev/files/udev-start-135-r3.sh index 5525483e6966..84de1628a534 100644 --- a/sys-fs/udev/files/udev-start-135-r3.sh +++ b/sys-fs/udev/files/udev-start-135-r3.sh @@ -8,6 +8,9 @@ compat_volume_nodes() { # Only do this for baselayout-1* + # This check is likely to get false positives due to some multilib stuff, + # but that should not matter, as this can only happen on old openrc versions + # no longer available as ebuilds. if [ ! -e /lib/librc.so ]; then # Create nodes that udev can't |