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

[Robert Millan]

Author: rmh
Date: 2011-07-28 22:49:51 +0000 (Thu, 28 Jul 2011)
New Revision: 3641

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/035_nfs.diff
Log:
Rename /var/db/statd.status to FHS-compliant /var/lib/misc/statd.status.

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2011-07-28 21:15:06 UTC (rev 3640)
+++ trunk/freebsd-utils/debian/changelog	2011-07-28 22:49:51 UTC (rev 3641)
@@ -2,8 +2,9 @@
 
   * Register rpc.statd before rpc.lockd to prevent freebsd-nfs-common
     postinst failure.
+  * Rename /var/db/statd.status to FHS-compliant /var/lib/misc/statd.status.
 
- -- Robert Millan <rmh at debian.org>  Thu, 28 Jul 2011 23:14:54 +0200
+ -- Robert Millan <rmh at debian.org>  Fri, 29 Jul 2011 00:49:20 +0200
 
 freebsd-utils (8.2+ds2-4) experimental; urgency=low
 

Modified: trunk/freebsd-utils/debian/patches/035_nfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/035_nfs.diff	2011-07-28 21:15:06 UTC (rev 3640)
+++ trunk/freebsd-utils/debian/patches/035_nfs.diff	2011-07-28 22:49:51 UTC (rev 3641)
@@ -468,6 +468,15 @@
  int debug = 0;		/* Controls syslog() calls for debug messages	*/
  
  char **hosts, *svcport_str = NULL;
+@@ -189,7 +191,7 @@
+ 	  }
+   }
+   endnetconfig(nc_handle);
+-  init_file("/var/db/statd.status");
++  init_file("/var/lib/misc/statd.status");
+ 
+   /* Note that it is NOT sensible to run this program from inetd - the 	*/
+   /* protocol assumes that it will run immediately at boot time.	*/
 @@ -446,7 +448,7 @@
  		children to exit when they have done their work.
  */
@@ -477,3 +486,14 @@
  {
    int pid, status;
    pid = wait4(-1, &status, WNOHANG, (struct rusage*)0);
+--- a/usr.sbin/rpc.statd/rpc.statd.8
++++ b/usr.sbin/rpc.statd/rpc.statd.8
+@@ -110,7 +110,7 @@
+ after the network has been started.
+ .Sh FILES
+ .Bl -tag -width /usr/include/rpcsvc/sm_inter.x -compact
+-.It Pa /var/db/statd.status
++.It Pa /var/lib/misc/statd.status
+ non-volatile record of currently monitored hosts.
+ .It Pa /usr/include/rpcsvc/sm_inter.x
+ RPC protocol specification used by local applications to register monitoring requests.