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

[Aurelien Jarno]

Author: aurel32
Date: 2010-01-23 15:27:45 +0000 (Sat, 23 Jan 2010)
New Revision: 2942

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/007_mount.diff
Log:
  * mount: assume that the mount helpers are located in /sbin instead of
    looking in $PATH, which may not contain /sbin when called from 
    scripts.



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2010-01-18 10:17:49 UTC (rev 2941)
+++ trunk/freebsd-utils/debian/changelog	2010-01-23 15:27:45 UTC (rev 2942)
@@ -1,3 +1,11 @@
+freebsd-utils (8.0-6) UNRELEASED; urgency=low
+
+  * mount: assume that the mount helpers are located in /sbin instead of
+    looking in $PATH, which may not contain /sbin when called from 
+    scripts.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 23 Jan 2010 16:26:51 +0100
+
 freebsd-utils (8.0-5) unstable; urgency=low
 
   * Add build-depends on libcam-dev for camcontrol. 

Modified: trunk/freebsd-utils/debian/patches/007_mount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/007_mount.diff	2010-01-18 10:17:49 UTC (rev 2941)
+++ trunk/freebsd-utils/debian/patches/007_mount.diff	2010-01-23 15:27:45 UTC (rev 2942)
@@ -30,12 +30,23 @@
  #include "extern.h"
  #include "mntopts.h"
  #include "pathnames.h"
-@@ -168,12 +170,9 @@
+@@ -159,6 +161,7 @@
+ static int
+ exec_mountprog(const char *name, const char *execname, char *const argv[])
+ {
++	char buf[256];
+ 	pid_t pid;
+ 	int status;
+ 
+@@ -167,13 +170,11 @@
+ 		warn("fork");
  		exit (1);
  	case 0:					/* Child. */
- 		/* Go find an executable. */
+-		/* Go find an executable. */
 -		execvP(execname, _PATH_SYSPATH, argv);
-+		execvp(execname, argv);
++		/* Mount programs are located in /sbin. */
++		snprintf(buf, sizeof(buf), "/sbin/%s", execname);
++		execv(buf, argv);
  		if (errno == ENOENT) {
  			warn("exec %s not found", execname);
 -			if (execname[0] != '/') {
@@ -44,25 +55,7 @@
  		}
  		exit(1);
  	default:				/* Parent. */
-@@ -218,6 +217,9 @@
- static void
- restart_mountd(void)
- {
-+#if 1
-+#warning missing pidfile_open(), pidfile_remove()
-+#else
- 	struct pidfh *pfh;
- 	pid_t mountdpid;
- 
-@@ -234,6 +236,7 @@
- 	/* We have mountd(8) PID in mountdpid varible, let's signal it. */
- 	if (kill(mountdpid, SIGHUP) == -1)
- 		err(1, "signal mountd");
-+#endif
- }
- 
- int
-@@ -250,7 +253,7 @@
+@@ -250,7 +251,7 @@
  	options = NULL;
  	vfslist = NULL;
  	vfstype = "ufs";
@@ -71,7 +64,7 @@
  		switch (ch) {
  		case 'a':
  			all = 1;
-@@ -258,9 +261,6 @@
+@@ -258,9 +259,6 @@
  		case 'd':
  			debug = 1;
  			break;
@@ -81,7 +74,7 @@
  		case 'f':
  			init_flags |= MNT_FORCE;
  			break;
-@@ -642,11 +642,13 @@
+@@ -645,11 +643,13 @@
  			(void)printf(", reads: sync %ju async %ju",
  			    (uintmax_t)sfp->f_syncreads,
  			    (uintmax_t)sfp->f_asyncreads);
@@ -95,7 +88,7 @@
  	}
  	(void)printf(")\n");
  }
-@@ -836,7 +838,7 @@
+@@ -839,7 +839,7 @@
  {
  
  	(void)fprintf(stderr, "%s\n%s\n%s\n",
@@ -104,7 +97,7 @@
  "       mount [-dfpruvw] special | node",
  "       mount [-dfpruvw] [-o options] [-t ufs | external_type] special node");
  	exit(1);
-@@ -853,7 +855,7 @@
+@@ -856,7 +856,7 @@
  
  	if (strncmp(ent->f_mntfromname, "<below>", 7) == 0 ||
  	    strncmp(ent->f_mntfromname, "<above>", 7) == 0) {