[Glibc-bsd-commits] r4182 - in trunk/freebsd-utils/debian: . local/scripts/bin patches

[Robert Millan]

Author: rmh
Date: 2012-04-09 21:31:10 +0000 (Mon, 09 Apr 2012)
New Revision: 4182

Added:
   trunk/freebsd-utils/debian/patches/mount_cli_compat.diff
Removed:
   trunk/freebsd-utils/debian/local/scripts/bin/mount
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/freebsd-utils.install
   trunk/freebsd-utils/debian/patches/007_mount.diff
   trunk/freebsd-utils/debian/patches/series
Log:
Replace mount wrap script with source patch (mount_cli_compat.diff).

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2012-04-09 19:20:51 UTC (rev 4181)
+++ trunk/freebsd-utils/debian/changelog	2012-04-09 21:31:10 UTC (rev 4182)
@@ -1,8 +1,9 @@
 freebsd-utils (9.0+ds1-3) UNRELEASED; urgency=low
 
   * Restore default CPU frequency after stopping powerd.
+  * Replace mount wrap script with source patch (mount_cli_compat.diff).
 
- -- Robert Millan <rmh at debian.org>  Mon, 09 Apr 2012 10:57:14 +0200
+ -- Robert Millan <rmh at debian.org>  Mon, 09 Apr 2012 23:30:57 +0200
 
 freebsd-utils (9.0+ds1-2) unstable; urgency=low
 

Modified: trunk/freebsd-utils/debian/freebsd-utils.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.install	2012-04-09 19:20:51 UTC (rev 4181)
+++ trunk/freebsd-utils/debian/freebsd-utils.install	2012-04-09 21:31:10 UTC (rev 4182)
@@ -1,11 +1,10 @@
 bin/kenv/kenv				/bin
 
-sbin/mount/mount			/lib/freebsd
+sbin/mount/mount			/bin
 sbin/umount/umount			/lib/freebsd
 sbin/sysctl/sysctl			/lib/freebsd
 
 debian/local/devfs.d/*			/etc/devfs.d
-debian/local/scripts/bin/mount		/bin
 debian/local/scripts/bin/sysctl		/bin
 debian/local/scripts/sbin/umount	/sbin
 

Deleted: trunk/freebsd-utils/debian/local/scripts/bin/mount
===================================================================
--- trunk/freebsd-utils/debian/local/scripts/bin/mount	2012-04-09 19:20:51 UTC (rev 4181)
+++ trunk/freebsd-utils/debian/local/scripts/bin/mount	2012-04-09 21:31:10 UTC (rev 4182)
@@ -1,18 +0,0 @@
-#!/bin/sh
-set -e
-
-args=""
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -f) args="${args} -d" ;;
-    -n) ;;
-    -O) shift ;;
-    *)  if [ -n "${args}" ] ; then args="${args} $1" ; else args="$1" ; fi ;;
-  esac
-  shift
-done
-
-args=`echo ${args} |
-  sed -r -e "/-o[[:space:]]+[^[:space:]]*remount/ s/remount/update/g"`
-
-exec /lib/freebsd/mount ${args}

Modified: trunk/freebsd-utils/debian/patches/007_mount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/007_mount.diff	2012-04-09 19:20:51 UTC (rev 4181)
+++ trunk/freebsd-utils/debian/patches/007_mount.diff	2012-04-09 21:31:10 UTC (rev 4182)
@@ -17,12 +17,12 @@
  	options = NULL;
  	vfslist = NULL;
  	vfstype = "ufs";
--	while ((ch = getopt(argc, argv, "adF:flo:prt:uvw")) != -1)
-+	while ((ch = getopt(argc, argv, "adflo:prt:uvw")) != -1)
+-	while ((ch = getopt(argc, argv, "adF:flo:prt:uvwnO:")) != -1)
++	while ((ch = getopt(argc, argv, "adflo:prt:uvwnO:")) != -1)
  		switch (ch) {
- 		case 'a':
- 			all = 1;
-@@ -260,9 +260,6 @@
+ 		case 'n':
+ 		case 'O':
+@@ -264,9 +264,6 @@
  		case 'd':
  			debug = 1;
  			break;
@@ -32,7 +32,7 @@
  		case 'f':
  			init_flags |= MNT_FORCE;
  			break;
-@@ -656,11 +653,13 @@
+@@ -660,11 +657,13 @@
  			(void)printf(", reads: sync %ju async %ju",
  			    (uintmax_t)sfp->f_syncreads,
  			    (uintmax_t)sfp->f_asyncreads);
@@ -46,7 +46,7 @@
  	}
  	(void)printf(")\n");
  }
-@@ -858,7 +857,7 @@
+@@ -867,7 +866,7 @@
  {
  
  	(void)fprintf(stderr, "%s\n%s\n%s\n",
@@ -55,7 +55,7 @@
  "       mount [-dfpruvw] special | node",
  "       mount [-dfpruvw] [-o options] [-t ufs | external_type] special node");
  	exit(1);
-@@ -883,7 +882,7 @@
+@@ -892,7 +891,7 @@
  
  	if (strncmp(ent->f_mntfromname, "<below>", 7) == 0 ||
  	    strncmp(ent->f_mntfromname, "<above>", 7) == 0) {

Added: trunk/freebsd-utils/debian/patches/mount_cli_compat.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/mount_cli_compat.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/mount_cli_compat.diff	2012-04-09 21:31:10 UTC (rev 4182)
@@ -0,0 +1,28 @@
+--- a/sbin/mount/mount.c
++++ b/sbin/mount/mount.c
+@@ -252,8 +252,12 @@
+ 	options = NULL;
+ 	vfslist = NULL;
+ 	vfstype = "ufs";
+-	while ((ch = getopt(argc, argv, "adF:flo:prt:uvw")) != -1)
++	while ((ch = getopt(argc, argv, "adF:flo:prt:uvwnO:")) != -1)
+ 		switch (ch) {
++		case 'n':
++		case 'O':
++			/* Compatibility glue. */
++			break;
+ 		case 'a':
+ 			all = 1;
+ 			break;
+@@ -761,6 +765,11 @@
+ 			} else if (strncmp(p, groupquotaeq,
+ 			    sizeof(groupquotaeq) - 1) == 0) {
+ 				continue;
++			} else if (strcmp(p, "remount") == 0) {
++				/* Compatibility glue. */
++				append_arg(a, strdup("-o"));
++				append_arg(a, strdup("update"));
++				continue;
+ 			} else if (*p == '-') {
+ 				append_arg(a, p);
+ 				p = strchr(p, '=');

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2012-04-09 19:20:51 UTC (rev 4181)
+++ trunk/freebsd-utils/debian/patches/series	2012-04-09 21:31:10 UTC (rev 4182)
@@ -6,6 +6,7 @@
 pf_regex_h.diff
 pf_regex_followup.diff
 savecore_signal.diff
+mount_cli_compat.diff
 
 # Other patches that might or might not be mergeable
 001_dmesg.diff