Package: nfs-utils
Version: 1:1.0.7-3
Hi,
I've uploaded an NMU (1:1.0.7-3.1) for nfs-utils into DELAYED/7-day, fixing
most of the low-hanging fruit. Attached is the diff; please let me know if
there are any problems. (Note that debdiff can't catch my chmod u+w debian/*,
but it is done in the upload.)
--
Homepage: http://www.sesse.net/
diff -u nfs-utils-1.0.7/debian/control nfs-utils-1.0.7/debian/control
--- nfs-utils-1.0.7/debian/control
+++ nfs-utils-1.0.7/debian/control
@@ -8,7 +8,7 @@
Package: nfs-kernel-server
Priority: optional
Architecture: any
-Depends: nfs-common (>= 1:0.3.3-3), debconf (>= 1.0), sysvinit (>= 2.80-1),
${shlibs:Depends}
+Depends: nfs-common (>= 1:0.3.3-3), sysvinit (>= 2.80-1), ${shlibs:Depends}
Provides: knfs, nfs-server
Conflicts: knfs, nfs-server
Replaces: knfs, nfs-server
@@ -22,7 +22,7 @@
Package: nfs-common
Architecture: any
-Depends: portmap, debconf (>= 1.0), sysvinit (>= 2.80-1), ${shlibs:Depends}
+Depends: portmap, sysvinit (>= 2.80-1), ${shlibs:Depends}
Provides: nfs-client
Conflicts: nfs-client
Replaces: nfs-client
@@ -39,4 +39,11 @@
Replaces: nfs-kernel-server
Description: NFS benchmark program
+ nhfsstone (pronounced n-f-s-stone, the "h" is silent) is used on a
+ NFS client to generate an artificial load with a particular mix of
+ NFS operations. It reports the average response time of the server
+ in milliseconds per call and the load in calls per second. The
+ program adjusts its calling patterns based on the client's kernel
+ NFS statistics and the elapsed time. Load can be generated over a
+ given time or number of NFS calls.
.
Upstream: SourceForge project "nfs", CVS module nfs-utils.
diff -u nfs-utils-1.0.7/debian/changelog nfs-utils-1.0.7/debian/changelog
--- nfs-utils-1.0.7/debian/changelog
+++ nfs-utils-1.0.7/debian/changelog
@@ -1,3 +1,40 @@
+nfs-utils (1:1.0.7-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Set u+w on all files in debian/, so dch etc. actually works.
+ * Add /var/lib/nfs/v4recovery to nfs-kernel-server.dirs. (Closes: #337836).
+ * Add /var/lib/nfs/rpc_pipefs to nfs-kernel-server.dirs. (Closes: #310940).
+ * Fix problems with exportfs -o when there are multiple entries of the same
+ type for the same path that match a given client; patch from Fumihiko
+ Kakuma. (Closes: #245449)
+ * Start nfs-kernel-server even if /etc/exports is empty, as long as it
+ exists; patch from Alexis Huxley. (Closes: #246904) This patch also
+ happens to fix and thus Closes: #338292.
+ * When stopping daemons, do it even if they do not run as root; based on a
+ patch from Andreas Schmidt. (Closes: #247473)
+ * SIGKILL kernel lockd thread on stop, to make the kernel release all its
+ locks; patch from Jeffrey Layton. (Closes: #252081)
+ * Flush the kernel export table on stop; patch from Jeffrey Layton
+ (Closes: #248300).
+ * Change default root-squashed uid from -2 to 65534; the former changes
+ depending of the size of uid_t, and we want it to match the user "nobody"
+ (which has uid 65534). (Closes: #323460)
+ * Remove dependency on debconf, as it's no longer used. Also, don't run
+ dh_installdebconf anymore. (Closes: #332047)
+ * Check for /sbin/modprobe before using it, for non-modular kernels;
+ patch from Vincent Crvt. (Closes: #294928)
+ * Replaced the rather emtpy nhfsstone long description by the one from
+ its manpage. (Closes: #303497)
+ * Don't ship upstream README anymore, as it's not relevant for our users.
+ (Closes: #326663)
+ * Add the ability to start nfs-kernel-server niced; patch from Kimmo
+ Tervinen. (Closes: #287026)
+ * Escape '#' when writing export entries, so they are not mistakenly parsed
+ as comments when re-reading them. (Closes: #239230)
+ * Also Closes: #359024 automatically by recompiling package.
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Sun, 26 Mar 2006 14:57:50 +0200
+
nfs-utils (1:1.0.7-3) unstable; urgency=medium
* New maintainer, closes: #303559.
diff -u nfs-utils-1.0.7/debian/nfs-kernel-server.default
nfs-utils-1.0.7/debian/nfs-kernel-server.default
--- nfs-utils-1.0.7/debian/nfs-kernel-server.default
+++ nfs-utils-1.0.7/debian/nfs-kernel-server.default
@@ -1,6 +1,9 @@
# Number of servers to start up
RPCNFSDCOUNT=8
+# Runtime priority of server (see nice(1))
+RPCNFSDPRIORITY=0
+
# Options for rpc.mountd
RPCMOUNTDOPTS=
diff -u nfs-utils-1.0.7/debian/rules nfs-utils-1.0.7/debian/rules
--- nfs-utils-1.0.7/debian/rules
+++ nfs-utils-1.0.7/debian/rules
@@ -63,7 +63,7 @@
rm -rf tmp/var/lib/nfs/*; \
cp --preserve=timestamps etc.exports tmp/etc/exports
# Fixups End Here #
- dh_installdocs -A README
+ dh_installdocs -A
dh_installexamples
# dh_installmenu
dh_installinit -n
@@ -74,7 +74,6 @@
dh_strip
dh_compress
dh_fixperms
- dh_installdebconf
dh_installdeb
# dh_makeshlibs
dh_shlibdeps
diff -u nfs-utils-1.0.7/support/nfs/exports.c
nfs-utils-1.0.7/support/nfs/exports.c
--- nfs-utils-1.0.7/support/nfs/exports.c
+++ nfs-utils-1.0.7/support/nfs/exports.c
@@ -87,8 +87,8 @@
ee.e_flags &= ~NFSEXP_GATHERED_WRITES;
}
ee.e_maptype = CLE_MAP_IDENT;
- ee.e_anonuid = -2;
- ee.e_anongid = -2;
+ ee.e_anonuid = 65534;
+ ee.e_anongid = 65534;
ee.e_squids = NULL;
ee.e_sqgids = NULL;
ee.e_mountpoint = NULL;
@@ -161,7 +161,7 @@
fp = efp->x_fp;
for (i=0; esc[i]; i++)
- if (iscntrl(esc[i]) || esc[i] == '"' || esc[i] == '\\'||
isspace(esc[i]))
+ if (iscntrl(esc[i]) || esc[i] == '"' || esc[i] == '\\' ||
esc[i] == '#' || isspace(esc[i]))
fprintf(fp, "\\%03o", esc[i]);
else
fprintf(fp, "%c", esc[i]);
@@ -265,8 +265,8 @@
ee.e_flags = EXPORT_DEFAULT_FLAGS;
ee.e_maptype = CLE_MAP_IDENT;
- ee.e_anonuid = -2;
- ee.e_anongid = -2;
+ ee.e_anonuid = 65534;
+ ee.e_anongid = 65534;
ee.e_squids = NULL;
ee.e_sqgids = NULL;
ee.e_mountpoint = NULL;
diff -u nfs-utils-1.0.7/utils/exportfs/exportfs.c
nfs-utils-1.0.7/utils/exportfs/exportfs.c
--- nfs-utils-1.0.7/utils/exportfs/exportfs.c
+++ nfs-utils-1.0.7/utils/exportfs/exportfs.c
@@ -410,9 +410,9 @@
c = dumpopt(c, "mapping=ugidd");
else if (ep->e_maptype == CLE_MAP_FILE)
c = dumpopt(c, "mapping=file");
- if (ep->e_anonuid != -2)
+ if (ep->e_anonuid != 65534)
c = dumpopt(c, "anonuid=%d", ep->e_anonuid);
- if (ep->e_anongid != -2)
+ if (ep->e_anongid != 65534)
c = dumpopt(c, "anongid=%d", ep->e_anongid);
printf("%c\n", (c != '(')? ')' : ' ');
diff -u nfs-utils-1.0.7/utils/exportfs/exports.man
nfs-utils-1.0.7/utils/exportfs/exports.man
--- nfs-utils-1.0.7/utils/exportfs/exports.man
+++ nfs-utils-1.0.7/utils/exportfs/exports.man
@@ -323,7 +323,7 @@
'''in the password file at startup time. If it isn't found, a uid and gid
.I exportfs
chooses a uid and gid
-of -2 (i.e. 65534) for squashed access. These values can also be overridden by
+of 65534 for squashed access. These values can also be overridden by
the
.IR anonuid " and " anongid
options.
only in patch2:
unchanged:
--- nfs-utils-1.0.7.orig/debian/nfs-common.init
+++ nfs-utils-1.0.7/debian/nfs-common.init
@@ -117,25 +117,27 @@
then
printf " gssd"
start-stop-daemon --stop --oknodo --quiet \
- --name rpc.gssd --user 0
+ --name rpc.gssd
rm -f $GSSD_PIDFILE
fi
if [ "$NEED_IDMAPD" = yes ]
then
printf " idmapd"
start-stop-daemon --stop --oknodo --quiet \
- --name rpc.idmapd --user 0
+ --name rpc.idmapd
rm -f $IDMAPD_PIDFILE
fi
if [ "$NEED_LOCKD" = yes ]
then
printf " lockd"
start-stop-daemon --stop --oknodo --quiet \
- --name rpc.lockd --user 0 || true
+ --name rpc.lockd || true
+ else
+ pkill -KILL -u root -x lockd
fi
printf " statd"
start-stop-daemon --stop --oknodo --quiet \
- --name rpc.statd --user 0
+ --name rpc.statd
echo "."
;;
only in patch2:
unchanged:
--- nfs-utils-1.0.7.orig/debian/nfs-kernel-server.init
+++ nfs-utils-1.0.7/debian/nfs-kernel-server.init
@@ -25,6 +25,7 @@
# Read config
DEFAULTFILE=/etc/default/nfs-kernel-server
RPCNFSDCOUNT=8
+RPCNFSDPRIORITY=0
RPCMOUNTDOPTS=
NEED_SVCGSSD=yes
RPCGSSDOPTS=
@@ -35,7 +36,10 @@
fi
do_modprobe() {
- modprobe -q "$1" || true
+ if [ -x /sbin/modprobe ]
+ then
+ modprobe -q "$1" || true
+ fi
}
do_mount() {
@@ -55,7 +59,7 @@
case "$1" in
start)
cd / # daemons should have root dir as cwd
- if grep -q '^/' /etc/exports
+ if [ -f /etc/exports ]
then
do_modprobe nfsd
do_mount nfsd $PROCNFSD_MOUNTPOINT || NEED_SVCGSSD=no
@@ -74,6 +78,7 @@
printf " nfsd"
start-stop-daemon --start --quiet \
+ --nicelevel $RPCNFSDPRIORITY \
--exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT
printf " mountd"
@@ -119,6 +124,10 @@
printf "Unexporting directories for $DESC..."
$PREFIX/sbin/exportfs -au
+ if mountpoint -q /proc/nfs/nfsd
+ then
+ $PREFIX/sbin/exportfs -f
+ fi
echo "done."
;;
only in patch2:
unchanged:
--- nfs-utils-1.0.7.orig/debian/nfs-kernel-server.dirs
+++ nfs-utils-1.0.7/debian/nfs-kernel-server.dirs
@@ -1,3 +1,5 @@
etc/init.d
usr/sbin
var/lib/nfs
+var/lib/nfs/v4recovery
+var/lib/nfs/rpc_pipefs
only in patch2:
unchanged:
--- nfs-utils-1.0.7.orig/support/export/export.c
+++ nfs-utils-1.0.7/support/export/export.c
@@ -129,7 +129,7 @@
xlog(L_FATAL, "unknown client type in export_add");
epp = exportlist + type;
- while (*epp && slen < strlen((*epp)->m_export.e_path))
+ while (*epp && slen <= strlen((*epp)->m_export.e_path))
epp = &((*epp)->m_next);
exp->m_next = *epp;
*epp = exp;
only in patch2:
unchanged:
--- nfs-utils-1.0.7.orig/support/nfs/clients.c
+++ nfs-utils-1.0.7/support/nfs/clients.c
@@ -77,8 +77,8 @@
cle.c_hostname[0] = '\0';
cle.c_fhkey.k_type = CLE_KEY_NONE;
cle.c_mapping = CLE_MAP_IDENT;
- cle.c_anonuid = -2;
- cle.c_anongid = -2;
+ cle.c_anonuid = 65534;
+ cle.c_anongid = 65534;
if (squash_uids)
xfree(squash_uids);
