summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-12-29 09:46:04 +0000
committerMike Frysinger <vapier@gentoo.org>2007-12-29 09:46:04 +0000
commit897e6746def26236d0e9d75a97f3d2c8a1e93c21 (patch)
tree272e5aee380cb39fb916fa040949f412a661bad6
parentVersion bump #197336 by Francisco Javier. Tweak nfs init.d needs based on ex... (diff)
downloadhistorical-897e6746def26236d0e9d75a97f3d2c8a1e93c21.tar.gz
historical-897e6746def26236d0e9d75a97f3d2c8a1e93c21.tar.bz2
historical-897e6746def26236d0e9d75a97f3d2c8a1e93c21.zip
Make sure we check for "nfs" and not "nfsd" when doing client filesystem setup.
Package-Manager: portage-2.1.4_rc11
-rw-r--r--net-fs/nfs-utils/ChangeLog5
-rw-r--r--net-fs/nfs-utils/Manifest22
-rwxr-xr-xnet-fs/nfs-utils/files/nfsmount.initd4
3 files changed, 17 insertions, 14 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 0a195c2579c3..811f4ca288b5 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-fs/nfs-utils
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.111 2007/12/29 09:33:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.112 2007/12/29 09:46:03 vapier Exp $
+
+ 29 Dec 2007; Mike Frysinger <vapier@gentoo.org> files/nfsmount.initd:
+ Make sure we check for "nfs" and not "nfsd" when doing client filesystem setup.
*nfs-utils-1.1.1 (29 Dec 2007)
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index d270561cfb78..c6016a5f6063 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -29,10 +29,10 @@ AUX nfsmount 1131 RMD160 f67431f36e702c50c67ff799d96c8bd37fbe847f SHA1 c88b592db
MD5 2af8106db3fdcb3d5ddf22ea5fffb105 files/nfsmount 1131
RMD160 f67431f36e702c50c67ff799d96c8bd37fbe847f files/nfsmount 1131
SHA256 8c1b12047327d707743bc579151ff7e3800696cc46cfcaea1c58a93fbc11f9e7 files/nfsmount 1131
-AUX nfsmount.initd 1021 RMD160 ca3ada53d56118221bef64e37e78012381609e10 SHA1 4b408f5b74a22caccf2f3bd4ff7466ba81b772ac SHA256 e1405c2760f743fc7569812350ad687397a47d5ca5956944c3fded6d8fa71d8f
-MD5 994b00b4dde2cdcde52283fdd279f128 files/nfsmount.initd 1021
-RMD160 ca3ada53d56118221bef64e37e78012381609e10 files/nfsmount.initd 1021
-SHA256 e1405c2760f743fc7569812350ad687397a47d5ca5956944c3fded6d8fa71d8f files/nfsmount.initd 1021
+AUX nfsmount.initd 1023 RMD160 ffbc0200ecc5baa967f0d8c6ff91d1dfee72a674 SHA1 b40e9d9185d20c59c68ff75053f6a154db0fbfb5 SHA256 ecbeb486ab10784794cd2621005b177bf267816639c6ba810af4760e94c1fb08
+MD5 52b269527502c2921a39f407e5217f5c files/nfsmount.initd 1023
+RMD160 ffbc0200ecc5baa967f0d8c6ff91d1dfee72a674 files/nfsmount.initd 1023
+SHA256 ecbeb486ab10784794cd2621005b177bf267816639c6ba810af4760e94c1fb08 files/nfsmount.initd 1023
AUX rpc.gssd.initd 1106 RMD160 75af3525935d319cb822a57ee7441e3579ac9d6d SHA1 4da6054e65843262246fb314b3b06051e3929b51 SHA256 8f80988fd6572bd251d1feaf75004cd7b02814d1541385a1fc82bbb05022c97c
MD5 0214d11900ca8ec925e476f35e1a1602 files/rpc.gssd.initd 1106
RMD160 75af3525935d319cb822a57ee7441e3579ac9d6d files/rpc.gssd.initd 1106
@@ -66,10 +66,10 @@ EBUILD nfs-utils-1.1.1.ebuild 3427 RMD160 f7de6685b55a98f7bf9d278406a1b0576a95c3
MD5 8a02fd7cef8d12a8ef621a9ceb588653 nfs-utils-1.1.1.ebuild 3427
RMD160 f7de6685b55a98f7bf9d278406a1b0576a95c338 nfs-utils-1.1.1.ebuild 3427
SHA256 8c9f6fb84710beecd856dcdd8a01f5f39d14212ef42f4d68032bf04ae1795341 nfs-utils-1.1.1.ebuild 3427
-MISC ChangeLog 16816 RMD160 f760e31295b11f88630907ff63c78a09a4f19312 SHA1 b6529d4315d0543f572fa78324d8f3a51d5dd2cf SHA256 19468d1eebb0470cd28679d5eea72d99b0f20706e1543b0490e39c5c047dc4c7
-MD5 630dfc1078475f4f3c4c639b2da40721 ChangeLog 16816
-RMD160 f760e31295b11f88630907ff63c78a09a4f19312 ChangeLog 16816
-SHA256 19468d1eebb0470cd28679d5eea72d99b0f20706e1543b0490e39c5c047dc4c7 ChangeLog 16816
+MISC ChangeLog 16971 RMD160 e8ef0f83556971bd3d3189040a9966887bdded76 SHA1 d0098f6eebe383ec9bb50d1eb887550de1cfb968 SHA256 286cdceeeab03428408f159a22e3b2887e993fb73cb9bdf5b28e97e35935126d
+MD5 471f28511010ea76a3bae4769972f241 ChangeLog 16971
+RMD160 e8ef0f83556971bd3d3189040a9966887bdded76 ChangeLog 16971
+SHA256 286cdceeeab03428408f159a22e3b2887e993fb73cb9bdf5b28e97e35935126d ChangeLog 16971
MISC metadata.xml 225 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a SHA1 02c4f79d48d465ad7bca76f706d0f7cb7dd039df SHA256 42f511d0cc6e82e29b011c686ba8bb7965f4d92eb6e47ba3e63d4c7edfe9883a
MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
RMD160 477581252d7edf18d7b8a274766e2ed04c61935a metadata.xml 225
@@ -89,7 +89,7 @@ SHA256 eab4b638df3a5fcbf1b0840aaaf2caa54a3ccbd990cca6d8dcddc69d77eef1c8 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.8 (GNU/Linux)
-iEYEARECAAYFAkd2FEcACgkQj9hvisErhMKIsgCfRSOKWDkJDcw1HAyqbuW7sfgF
-oVwAn27H2pWz9hMHYOj9CPlyMljMCO8+
-=yxjm
+iEYEARECAAYFAkd2FzkACgkQj9hvisErhML6ngCgzZMLwKfiEB+tJVO0cgxYGy7G
+jd0AoODmnlMRSaxKHyBc+/gd25d5OJbb
+=qGYx
-----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfsmount.initd b/net-fs/nfs-utils/files/nfsmount.initd
index d6a7191f5133..6d9e1b3446f8 100755
--- a/net-fs/nfs-utils/files/nfsmount.initd
+++ b/net-fs/nfs-utils/files/nfsmount.initd
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.4 2007/08/16 23:35:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.5 2007/12/29 09:46:04 vapier Exp $
[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
@@ -23,7 +23,7 @@ start() {
fi
# Make sure nfs support is loaded in the kernel #64709
- if [ -e /proc/modules ] && ! grep -qs nfsd /proc/filesystems ; then
+ if [ -e /proc/modules ] && ! grep -qs 'nfs$' /proc/filesystems ; then
modprobe -q nfs
fi