[Glibc-bsd-commits] r4359 - in trunk/freebsd-utils/debian: . patches

[Arno Töll]

Author: atoell-guest
Date: 2012-09-15 21:22:12 +0000 (Sat, 15 Sep 2012)
New Revision: 4359

Added:
   trunk/freebsd-utils/debian/freebsd-nfs-server.dirs
   trunk/freebsd-utils/debian/freebsd-nfs-server.postinst
   trunk/freebsd-utils/debian/patches/stablerestart-fhs-compliance.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/series
Log:
Close #686013 - Touch nfs-stablerestart in postinst when necessary

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2012-09-09 12:23:36 UTC (rev 4358)
+++ trunk/freebsd-utils/debian/changelog	2012-09-15 21:22:12 UTC (rev 4359)
@@ -1,3 +1,11 @@
+freebsd-utils (9.0+ds1-8) UNRELEASED; urgency=low
+
+    Fix "NFSD does not start": freebsd-nfs-server requires the nfs-stablerestart
+    state file to be existing to start. This file is created in postinst if it
+    does not exist yet now (Closes: #686013)
+
+ -- Arno Töll <arno at debian.org>  Sun, 16 Sep 2012 00:06:47 +0200
+
 freebsd-utils (9.0+ds1-7) unstable; urgency=low
 
   * Move /bin/sysctl to /sbin/. (Closes: #679128)

Added: trunk/freebsd-utils/debian/freebsd-nfs-server.dirs
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-server.dirs	                        (rev 0)
+++ trunk/freebsd-utils/debian/freebsd-nfs-server.dirs	2012-09-15 21:22:12 UTC (rev 4359)
@@ -0,0 +1 @@
+/var/lib/freebsd-nfs-server

Added: trunk/freebsd-utils/debian/freebsd-nfs-server.postinst
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-server.postinst	                        (rev 0)
+++ trunk/freebsd-utils/debian/freebsd-nfs-server.postinst	2012-09-15 21:22:12 UTC (rev 4359)
@@ -0,0 +1,48 @@
+#! /bin/sh
+# postinst script for freebsd-nfs-server
+#
+# see: dh_installdeb(1)
+#
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+
+set -e
+
+
+case "$1" in
+	configure)
+		if [ ! -f /var/lib/freebsd-nfs-server/nfs-stablerestart ] ; then
+			echo "initializing /var/lib/freebsd-nfs-server/nfs-stablerestart"
+			touch /var/lib/freebsd-nfs-server/nfs-stablerestart
+		fi
+	;;
+	abort-upgrade|abort-remove|abort-deconfigure)
+	;;
+	*)
+		echo "postinst called with unknown argument \`$1'" >&2
+		exit 0
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2012-09-09 12:23:36 UTC (rev 4358)
+++ trunk/freebsd-utils/debian/patches/series	2012-09-15 21:22:12 UTC (rev 4359)
@@ -46,3 +46,4 @@
 041_delete_key.diff
 043_ppp.diff
 devd_link_c++_statically.diff
+stablerestart-fhs-compliance.diff

Added: trunk/freebsd-utils/debian/patches/stablerestart-fhs-compliance.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/stablerestart-fhs-compliance.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/stablerestart-fhs-compliance.diff	2012-09-15 21:22:12 UTC (rev 4359)
@@ -0,0 +1,45 @@
+--- a/usr.sbin/nfsd/nfsd.c
++++ b/usr.sbin/nfsd/nfsd.c
+@@ -80,8 +80,8 @@
+ int	debug = 0;
+ #endif
+ 
+-#define	NFSD_STABLERESTART	"/var/db/nfs-stablerestart"
+-#define	NFSD_STABLEBACKUP	"/var/db/nfs-stablerestart.bak"
++#define	NFSD_STABLERESTART	"/var/lib/freebsd-nfs-server/nfs-stablerestart"
++#define	NFSD_STABLEBACKUP	"/var/lib/freebsd-nfs-server/nfs-stablerestart.bak"
+ #define	MAXNFSDCNT	256
+ #define	DEFNFSDCNT	 4
+ pid_t	children[MAXNFSDCNT];	/* PIDs of children */
+--- a/usr.sbin/nfsd/nfsv4.4
++++ b/usr.sbin/nfsd/nfsv4.4
+@@ -288,10 +288,10 @@
+ .Xr rc.conf 5
+ variables.
+ .Sh FILES
+-.Bl -tag -width /var/db/nfs-stablerestart.bak -compact
+-.It Pa /var/db/nfs-stablerestart
++.Bl -tag -width /var/lib/freebsd-nfs-server/nfs-stablerestart.bak -compact
++.It Pa /var/lib/freebsd-nfs-server/nfs-stablerestart
+ NFS V4 stable restart file
+-.It Pa /var/db/nfs-stablerestart.bak
++.It Pa /var/lib/freebsd-nfs-server/nfs-stablerestart.bak
+ backup copy of the file
+ .El
+ .Sh SEE ALSO
+--- a/usr.sbin/nfsd/stablerestart.5
++++ b/usr.sbin/nfsd/stablerestart.5
+@@ -75,10 +75,10 @@
+ has returned. This might require hardware level caching to be disabled for
+ a local disk drive that holds the file, or similar.
+ .Sh FILES
+-.Bl -tag -width /var/db/nfs-stablerestart.bak -compact
+-.It Pa /var/db/nfs-stablerestart
++.Bl -tag -width /var/lib/freebsd-nfs-server/nfs-stablerestart.bak -compact
++.It Pa /var/lib/freebsd-nfs-server/nfs-stablerestart
+ NFSv4 stable restart file
+-.It Pa /var/db/nfs-stablerestart.bak
++.It Pa /var/lib/freebsd-nfs-server/nfs-stablerestart.bak
+ backup copy of the file
+ .El
+ .Sh SEE ALSO