| 1 |
zzam 09/01/19 17:24:30 |
| 2 |
|
| 3 |
Modified: udev-start-135-r3.sh shell-compat-118-r3.sh |
| 4 |
udev-135-r2.initd |
| 5 |
Log: |
| 6 |
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. |
| 7 |
(Portage version: 2.1.6.6/cvs/Linux 2.6.27-gentoo-r1 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 sys-fs/udev/files/udev-start-135-r3.sh |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-start-135-r3.sh?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-start-135-r3.sh?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-start-135-r3.sh?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: udev-start-135-r3.sh |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev-start-135-r3.sh,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- udev-start-135-r3.sh 27 Dec 2008 23:03:52 -0000 1.1 |
| 23 |
+++ udev-start-135-r3.sh 19 Jan 2009 17:24:30 -0000 1.2 |
| 24 |
@@ -8,6 +8,9 @@ |
| 25 |
compat_volume_nodes() |
| 26 |
{ |
| 27 |
# Only do this for baselayout-1* |
| 28 |
+ # This check is likely to get false positives due to some multilib stuff, |
| 29 |
+ # but that should not matter, as this can only happen on old openrc versions |
| 30 |
+ # no longer available as ebuilds. |
| 31 |
if [ ! -e /lib/librc.so ]; then |
| 32 |
|
| 33 |
# Create nodes that udev can't |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.2 sys-fs/udev/files/shell-compat-118-r3.sh |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/shell-compat-118-r3.sh?rev=1.2&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/shell-compat-118-r3.sh?rev=1.2&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/shell-compat-118-r3.sh?r1=1.1&r2=1.2 |
| 42 |
|
| 43 |
Index: shell-compat-118-r3.sh |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/files/shell-compat-118-r3.sh,v |
| 46 |
retrieving revision 1.1 |
| 47 |
retrieving revision 1.2 |
| 48 |
diff -u -r1.1 -r1.2 |
| 49 |
--- shell-compat-118-r3.sh 8 Feb 2008 10:39:24 -0000 1.1 |
| 50 |
+++ shell-compat-118-r3.sh 19 Jan 2009 17:24:30 -0000 1.2 |
| 51 |
@@ -48,15 +48,14 @@ |
| 52 |
} |
| 53 |
fi |
| 54 |
|
| 55 |
+# only for baselayout-1, does exist in all openrc versions |
| 56 |
if ! cmd_exist fstabinfo; then |
| 57 |
fstabinfo() { |
| 58 |
[ "$1" = "--quiet" ] && shift |
| 59 |
local dir="$1" |
| 60 |
|
| 61 |
# only check RC_USE_FSTAB on baselayout-1 |
| 62 |
- if [ ! -e /lib/librc.so ]; then |
| 63 |
- yesno "${RC_USE_FSTAB}" || return 1 |
| 64 |
- fi |
| 65 |
+ yesno "${RC_USE_FSTAB}" || return 1 |
| 66 |
|
| 67 |
# check if entry is in /etc/fstab |
| 68 |
local ret=$(gawk 'BEGIN { found="false"; } |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
1.5 sys-fs/udev/files/udev-135-r2.initd |
| 73 |
|
| 74 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-135-r2.initd?rev=1.5&view=markup |
| 75 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-135-r2.initd?rev=1.5&content-type=text/plain |
| 76 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-135-r2.initd?r1=1.4&r2=1.5 |
| 77 |
|
| 78 |
Index: udev-135-r2.initd |
| 79 |
=================================================================== |
| 80 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev-135-r2.initd,v |
| 81 |
retrieving revision 1.4 |
| 82 |
retrieving revision 1.5 |
| 83 |
diff -u -r1.4 -r1.5 |
| 84 |
--- udev-135-r2.initd 19 Jan 2009 09:05:21 -0000 1.4 |
| 85 |
+++ udev-135-r2.initd 19 Jan 2009 17:24:30 -0000 1.5 |
| 86 |
@@ -171,8 +171,8 @@ |
| 87 |
|
| 88 |
start() |
| 89 |
{ |
| 90 |
- # do not run this on too old baselayout - udev-addon is already loaded! |
| 91 |
- if [ ! -e /lib/librc.so -a -f /etc/init.d/sysfs ]; then |
| 92 |
+ # do not run this on old baselayout where udev-addon gets loaded |
| 93 |
+ if [ ! -f /etc/init.d/sysfs ]; then |
| 94 |
eerror "The $SVCNAME init-script is written for baselayout-2!" |
| 95 |
eerror "Please do not use it with baselayout-1!". |
| 96 |
return 1 |
Archives