[Glibc-bsd-commits] r4360 - trunk/freebsd-utils/debian

[Arno Töll]

Author: atoell-guest
Date: 2012-09-19 11:59:35 +0000 (Wed, 19 Sep 2012)
New Revision: 4360

Added:
   trunk/freebsd-utils/debian/freebsd-nfs-server.postrm
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/freebsd-nfs-server.postinst
Log:
Purge the stablerestart file in postrm. This is a corner case but it seems appropriate for purge

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2012-09-15 21:22:12 UTC (rev 4359)
+++ trunk/freebsd-utils/debian/changelog	2012-09-19 11:59:35 UTC (rev 4360)
@@ -2,9 +2,9 @@
 
     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)
+    does not exist yet now (Closes: #686013).
 
- -- Arno Töll <arno at debian.org>  Sun, 16 Sep 2012 00:06:47 +0200
+ -- Arno Töll <arno at debian.org>  Wed, 19 Sep 2012 13:19:10 +0200
 
 freebsd-utils (9.0+ds1-7) unstable; urgency=low
 

Modified: trunk/freebsd-utils/debian/freebsd-nfs-server.postinst
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-server.postinst	2012-09-15 21:22:12 UTC (rev 4359)
+++ trunk/freebsd-utils/debian/freebsd-nfs-server.postinst	2012-09-19 11:59:35 UTC (rev 4360)
@@ -29,7 +29,7 @@
 	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
+			install -o root -g root -m 600 /dev/null  /var/lib/freebsd-nfs-server/nfs-stablerestart
 		fi
 	;;
 	abort-upgrade|abort-remove|abort-deconfigure)

Added: trunk/freebsd-utils/debian/freebsd-nfs-server.postrm
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-server.postrm	                        (rev 0)
+++ trunk/freebsd-utils/debian/freebsd-nfs-server.postrm	2012-09-19 11:59:35 UTC (rev 4360)
@@ -0,0 +1,49 @@
+#!/bin/sh
+# postrm script for apache2
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    purge)
+
+	# Purge the stablerestart file. Despite of predicted apocalypse in
+	# http://www.freebsd.org/cgi/man.cgi?query=nfsv4&apropos=0&sektion=4&manpath=FreeBSD+9.0-RELEASE&arch=default&format=html
+	# when doing so. But purging the daemon will also force connections to
+	# terminate.
+        if [ -f /var/lib/freebsd-nfs-server/nfs-stablerestart ] ; then
+                echo "Purging /var/lib/freebsd-nfs-server/nfs-stablerestart"
+		rm -f /var/lib/freebsd-nfs-server/nfs-stablerestart
+		rm -f /var/lib/freebsd-nfs-server/nfs-stablerestart.bak
+        fi
+    ;;
+    abort-install|abort-upgrade)
+    ;;
+    remove|upgrade|failed-upgrade|disappear)
+    ;;
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0