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

[Guillem Jover]

Author: guillem
Date: 2011-06-07 18:29:01 +0000 (Tue, 07 Jun 2011)
New Revision: 3424

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/007_mount.diff
   trunk/freebsd-utils/debian/patches/018_umount.diff
Log:
Remove mentions of -F option from mount and umount man pages

Closes: #600940


Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2011-06-07 17:22:39 UTC (rev 3423)
+++ trunk/freebsd-utils/debian/changelog	2011-06-07 18:29:01 UTC (rev 3424)
@@ -1,6 +1,8 @@
 freebsd-utils (8.2-2) UNRELEASED; urgency=low
 
   * Add missing zlib1g-dev to Build-Depends, needed by savecore.
+  * Remove mentions of -F option from mount and umount man pages.
+    Closes: #600940
 
  -- Guillem Jover <guillem at debian.org>  Tue, 07 Jun 2011 19:11:16 +0200
 

Modified: trunk/freebsd-utils/debian/patches/007_mount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/007_mount.diff	2011-06-07 17:22:39 UTC (rev 3423)
+++ trunk/freebsd-utils/debian/patches/007_mount.diff	2011-06-07 18:29:01 UTC (rev 3424)
@@ -1,9 +1,10 @@
 ---
  sbin/mount/Makefile   |    2 +-
  sbin/mount/mntopts.h  |    4 ++++
+ sbin/mount/mount.8    |    5 -----
  sbin/mount/mount.c    |   22 +++++++++++-----------
  sbin/mount/mount_fs.c |    2 +-
- 4 files changed, 17 insertions(+), 13 deletions(-)
+ 5 files changed, 17 insertions(+), 18 deletions(-)
 
 --- a/sbin/mount/mntopts.h
 +++ b/sbin/mount/mntopts.h
@@ -126,3 +127,24 @@
 +LDADD=	-lutil -lbsd
  
  .include <bsd.prog.mk>
+--- a/sbin/mount/mount.8
++++ b/sbin/mount/mount.8
+@@ -37,7 +37,6 @@
+ .Sh SYNOPSIS
+ .Nm
+ .Op Fl adflpruvw
+-.Op Fl F Ar fstab
+ .Op Fl o Ar options
+ .Op Fl t Cm ufs | Ar external_type
+ .Nm
+@@ -96,10 +95,6 @@ flag to
+ determine what the
+ .Nm
+ command is trying to do.
+-.It Fl F Ar fstab
+-Specify the
+-.Pa fstab
+-file to use.
+ .It Fl f
+ Forces the revocation of write access when trying to downgrade
+ a file system mount status from read-write to read-only.

Modified: trunk/freebsd-utils/debian/patches/018_umount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/018_umount.diff	2011-06-07 17:22:39 UTC (rev 3423)
+++ trunk/freebsd-utils/debian/patches/018_umount.diff	2011-06-07 18:29:01 UTC (rev 3424)
@@ -1,6 +1,7 @@
 ---
+ sbin/umount/umount.8 |    5 -----
  sbin/umount/umount.c |   30 ++++++------------------------
- 1 file changed, 6 insertions(+), 24 deletions(-)
+ 2 files changed, 6 insertions(+), 29 deletions(-)
 
 --- a/sbin/umount/umount.c
 +++ b/sbin/umount/umount.c
@@ -86,3 +87,24 @@
 +	    "       umount -a | -A [-fv] [-h host] [-t type]");
  	exit(1);
  }
+--- a/sbin/umount/umount.8
++++ b/sbin/umount/umount.8
+@@ -40,7 +40,6 @@
+ .Ar special | node | fsid
+ .Nm
+ .Fl a | A
+-.Op Fl F Ar fstab
+ .Op Fl fv
+ .Op Fl h Ar host
+ .Op Fl t Ar type
+@@ -69,10 +68,6 @@ are unmounted.
+ .It Fl A
+ All the currently mounted file systems except
+ the root are unmounted.
+-.It Fl F Ar fstab
+-Specify the
+-.Pa fstab
+-file to use.
+ .It Fl f
+ The file system is forcibly unmounted.
+ Active special devices continue to work,