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

[Robert Millan]

Author: rmh
Date: 2013-07-15 21:59:10 +0000 (Mon, 15 Jul 2013)
New Revision: 4751

Added:
   trunk/freebsd-utils/debian/patches/mount_n.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/007_mount.diff
   trunk/freebsd-utils/debian/patches/mount_cli_compat.diff
   trunk/freebsd-utils/debian/patches/series
Log:
Split mount -n option into its own patch, since it's now in upstream HEAD.

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2013-07-15 21:32:44 UTC (rev 4750)
+++ trunk/freebsd-utils/debian/changelog	2013-07-15 21:59:10 UTC (rev 4751)
@@ -4,6 +4,8 @@
   * Remove transitional dependency (freebsd-net-tools -> pf)
   * Misc improvements in PPP port. Among others, it should no longer be
     necessary to load modules manually.
+  * Split mount -n option into its own patch, since it's now in upstream
+    HEAD.
 
  -- Robert Millan <rmh at debian.org>  Tue, 09 Jul 2013 19:17:02 +0200
 

Modified: trunk/freebsd-utils/debian/patches/007_mount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/007_mount.diff	2013-07-15 21:32:44 UTC (rev 4750)
+++ trunk/freebsd-utils/debian/patches/007_mount.diff	2013-07-15 21:59:10 UTC (rev 4751)
@@ -13,26 +13,16 @@
  #define MOPT_NOATIME		{ "atime",	1, MNT_NOATIME, 0 }
 --- a/sbin/mount/mount.c
 +++ b/sbin/mount/mount.c
-@@ -252,7 +252,7 @@
- 	options = NULL;
- 	vfslist = NULL;
- 	vfstype = "ufs";
--	while ((ch = getopt(argc, argv, "adF:flo:prt:uvwnO:")) != -1)
-+	while ((ch = getopt(argc, argv, "adflo:prt:uvwnO:")) != -1)
- 		switch (ch) {
- 		case 'n':
- 		case 'O':
-@@ -264,9 +264,6 @@
- 		case 'd':
+@@ -264,7 +264,7 @@
  			debug = 1;
  			break;
--		case 'F':
+ 		case 'F':
 -			setfstab(optarg);
--			break;
++			// setfstab(optarg);
+ 			break;
  		case 'f':
  			init_flags |= MNT_FORCE;
- 			break;
-@@ -660,11 +657,13 @@
+@@ -662,11 +662,13 @@
  			(void)printf(", reads: sync %ju async %ju",
  			    (uintmax_t)sfp->f_syncreads,
  			    (uintmax_t)sfp->f_asyncreads);
@@ -46,7 +36,7 @@
  	}
  	(void)printf(")\n");
  }
-@@ -867,7 +866,7 @@
+@@ -869,7 +871,7 @@
  {
  
  	(void)fprintf(stderr, "%s\n%s\n%s\n",
@@ -55,7 +45,7 @@
  "       mount [-dfpruvw] special | node",
  "       mount [-dfpruvw] [-o options] [-t ufs | external_type] special node");
  	exit(1);
-@@ -892,7 +891,7 @@
+@@ -894,7 +896,7 @@
  
  	if (strncmp(ent->f_mntfromname, "<below>", 7) == 0 ||
  	    strncmp(ent->f_mntfromname, "<above>", 7) == 0) {

Modified: trunk/freebsd-utils/debian/patches/mount_cli_compat.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/mount_cli_compat.diff	2013-07-15 21:32:44 UTC (rev 4750)
+++ trunk/freebsd-utils/debian/patches/mount_cli_compat.diff	2013-07-15 21:59:10 UTC (rev 4751)
@@ -1,20 +1,19 @@
 --- a/sbin/mount/mount.c
 +++ b/sbin/mount/mount.c
-@@ -252,8 +252,12 @@
+@@ -252,8 +252,11 @@
  	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)
+-	while ((ch = getopt(argc, argv, "adF:flno:prt:uvw")) != -1)
++	while ((ch = getopt(argc, argv, "adF:flno:prt:uvwO:")) != -1)
  		switch (ch) {
-+		case 'n':
 +		case 'O':
 +			/* Compatibility glue. */
 +			break;
  		case 'a':
  			all = 1;
  			break;
-@@ -761,6 +765,11 @@
+@@ -764,6 +767,11 @@
  			} else if (strncmp(p, groupquotaeq,
  			    sizeof(groupquotaeq) - 1) == 0) {
  				continue;

Added: trunk/freebsd-utils/debian/patches/mount_n.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/mount_n.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/mount_n.diff	2013-07-15 21:59:10 UTC (rev 4751)
@@ -0,0 +1,36 @@
+
+From HEAD (SVN rev 253372)
+
+--- a/sbin/mount/mount.c
++++ b/sbin/mount/mount.c
+@@ -252,7 +252,7 @@
+ 	options = NULL;
+ 	vfslist = NULL;
+ 	vfstype = "ufs";
+-	while ((ch = getopt(argc, argv, "adF:flo:prt:uvw")) != -1)
++	while ((ch = getopt(argc, argv, "adF:flno:prt:uvw")) != -1)
+ 		switch (ch) {
+ 		case 'a':
+ 			all = 1;
+@@ -269,6 +269,9 @@
+ 		case 'l':
+ 			late = 1;
+ 			break;
++		case 'n':
++			/* For compatibility with the Linux version of mount. */
++			break;
+ 		case 'o':
+ 			if (*optarg) {
+ 				options = catopt(options, optarg);
+--- a/sbin/mount/mount.8
++++ b/sbin/mount/mount.8
+@@ -111,6 +111,9 @@
+ .Fl a
+ option, also mount those file systems which are marked as
+ .Dq Li late .
++.It Fl n
++For compatibility with some other implementations, this flag is
++currently a no-op.
+ .It Fl o
+ Options are specified with a
+ .Fl o

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2013-07-15 21:32:44 UTC (rev 4750)
+++ trunk/freebsd-utils/debian/patches/series	2013-07-15 21:59:10 UTC (rev 4751)
@@ -1,7 +1,8 @@
-# Patches that come from upstream
+# Patches from (or merged in) upstream
 ifconfig_nojail.diff
 powerd_no_cpufreq.diff
 savecore_signal.diff
+mount_n.diff
 
 # Patches that are in good shape for merging upstream
 pf_regex_c.diff