Bug#688575: unblock: freebsd-utils/9.0+ds1-8
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package freebsd-utils
This is a fix for #686013. It adds maintainer scripts setting up the state
file as required by the NFS server on kFreeBSD. The diff only fixes the RC bug, nothing else.
unblock freebsd-utils/9.0+ds1-8
A diff is inline below:
Index: freebsd-nfs-server.dirs
===================================================================
--- freebsd-nfs-server.dirs (revision 0)
+++ freebsd-nfs-server.dirs (revision 4362)
@@ -0,0 +1 @@
+/var/lib/freebsd-nfs-server
Index: freebsd-nfs-server.postrm
===================================================================
--- freebsd-nfs-server.postrm (revision 0)
+++ freebsd-nfs-server.postrm (revision 4362)
@@ -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
Index: freebsd-nfs-server.postinst
===================================================================
--- freebsd-nfs-server.postinst (revision 0)
+++ freebsd-nfs-server.postinst (revision 4362)
@@ -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"
+ install -o root -g root -m 600 /dev/null /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
Index: patches/stablerestart-fhs-compliance.diff
===================================================================
--- patches/stablerestart-fhs-compliance.diff (revision 0)
+++ patches/stablerestart-fhs-compliance.diff (revision 4362)
@@ -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
Index: patches/series
===================================================================
--- patches/series (revision 4343)
+++ patches/series (working copy)
@@ -46,3 +46,4 @@
041_delete_key.diff
043_ppp.diff
devd_link_c++_statically.diff
+stablerestart-fhs-compliance.diff
Index: changelog
===================================================================
--- changelog (revision 4343)
+++ changelog (working copy)
@@ -1,3 +1,12 @@
+freebsd-utils (9.0+ds1-8) unstable; urgency=low
+
+ * Team upload.
+ * 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@debian.org> Sun, 23 Sep 2012 17:20:27 +0200
+
freebsd-utils (9.0+ds1-7) unstable; urgency=low
* Move /bin/sysctl to /sbin/. (Closes: #679128)
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.3.0-trunk-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Reply to: