| 1 |
vapier 07/12/30 19:25:19 |
| 2 |
|
| 3 |
Modified: nfs.initd nfsmount.initd |
| 4 |
Log: |
| 5 |
Make sure /etc/exports and /etc/fstab exist to account for the stupid cases of running these init.d scripts without anything useful to do. |
| 6 |
(Portage version: 2.1.4_rc12) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.9 net-fs/nfs-utils/files/nfs.initd |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.9&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.9&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.8&r2=1.9 |
| 14 |
|
| 15 |
Index: nfs.initd |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v |
| 18 |
retrieving revision 1.8 |
| 19 |
retrieving revision 1.9 |
| 20 |
diff -u -r1.8 -r1.9 |
| 21 |
--- nfs.initd 30 Dec 2007 17:43:27 -0000 1.8 |
| 22 |
+++ nfs.initd 30 Dec 2007 19:25:18 -0000 1.9 |
| 23 |
@@ -1,7 +1,7 @@ |
| 24 |
#!/sbin/runscript |
| 25 |
# Copyright 1999-2007 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.8 2007/12/30 17:43:27 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.9 2007/12/30 19:25:18 vapier Exp $ |
| 29 |
|
| 30 |
opts="reload" |
| 31 |
|
| 32 |
@@ -17,8 +17,10 @@ |
| 33 |
|
| 34 |
depend() { |
| 35 |
local myneed="" |
| 36 |
- if ! awk '!/^[[:space:]]*#/ && $2 ~ /sec=/ { exit 1 }' /etc/exports ; then |
| 37 |
- myneed="${myneed} rpc.gssd" |
| 38 |
+ if [ -e /etc/exports ] ; then |
| 39 |
+ if awk '!/^[[:space:]]*#/ && $2 ~ /sec=/ { exit 0 } END { exit 1 }' /etc/exports ; then |
| 40 |
+ myneed="${myneed} rpc.gssd" |
| 41 |
+ fi |
| 42 |
fi |
| 43 |
config /etc/exports |
| 44 |
need portmap rpc.statd ${myneed} |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.7 net-fs/nfs-utils/files/nfsmount.initd |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd?rev=1.7&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd?rev=1.7&content-type=text/plain |
| 52 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd?r1=1.6&r2=1.7 |
| 53 |
|
| 54 |
Index: nfsmount.initd |
| 55 |
=================================================================== |
| 56 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v |
| 57 |
retrieving revision 1.6 |
| 58 |
retrieving revision 1.7 |
| 59 |
diff -u -r1.6 -r1.7 |
| 60 |
--- nfsmount.initd 30 Dec 2007 17:43:27 -0000 1.6 |
| 61 |
+++ nfsmount.initd 30 Dec 2007 19:25:18 -0000 1.7 |
| 62 |
@@ -1,16 +1,18 @@ |
| 63 |
#!/sbin/runscript |
| 64 |
# Copyright 1999-2007 Gentoo Foundation |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.6 2007/12/30 17:43:27 vapier Exp $ |
| 67 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.7 2007/12/30 19:25:18 vapier Exp $ |
| 68 |
|
| 69 |
[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs |
| 70 |
|
| 71 |
depend() { |
| 72 |
local myneed="" |
| 73 |
- awk '!/^[[:space:]]*#/ && $3 == "nfs4" { exit ($4 ~ /sec=krb/ ? 1 : 2) }' /etc/fstab |
| 74 |
- local ret=$? |
| 75 |
- [ ${ret} -ne 0 ] && myneed="${myneed} rpc.idmapd" |
| 76 |
- [ ${ret} -eq 1 ] && myneed="${myneed} rpc.gssd" |
| 77 |
+ if [ -e /etc/fstab ] ; then |
| 78 |
+ awk '!/^[[:space:]]*#/ && $3 == "nfs4" { exit ($4 ~ /sec=krb/ ? 1 : 2) }' /etc/fstab |
| 79 |
+ local ret=$? |
| 80 |
+ [ ${ret} -ne 0 ] && myneed="${myneed} rpc.idmapd" |
| 81 |
+ [ ${ret} -eq 1 ] && myneed="${myneed} rpc.gssd" |
| 82 |
+ fi |
| 83 |
config /etc/fstab |
| 84 |
need net portmap rpc.statd ${myneed} |
| 85 |
use ypbind dns rpc.idmapd rpc.gssd |
| 86 |
|
| 87 |
|
| 88 |
|
| 89 |
-- |
| 90 |
gentoo-commits@g.o mailing list |
Archives