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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-10-26 18:53:37 +0000 (Sun, 26 Oct 2014)
New Revision: 5671

Added:
   trunk/freebsd-utils/debian/patches/fstype_alias.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/series
Log:
fstype_alias.diff:  accept some Linux-style names for `mount -t`
filesystem types:
- ext2 for ext2fs
- ext3 for ext3fs
- ext4 for ext4fs
- cifs for smbfs


Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2014-10-26 18:17:06 UTC (rev 5670)
+++ trunk/freebsd-utils/debian/changelog	2014-10-26 18:53:37 UTC (rev 5671)
@@ -1,3 +1,14 @@
+freebsd-utils (10.1~svn273304-2) UNRELEASED; urgency=medium
+
+  * fstype_alias.diff:  accept some Linux-style names for `mount -t`
+    filesystem types:
+    - ext2 for ext2fs
+    - ext3 for ext3fs
+    - ext4 for ext4fs
+    - cifs for smbfs
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Sun, 26 Oct 2014 18:50:21 +0000
+
 freebsd-utils (10.1~svn273304-1) unstable; urgency=medium
 
   [ Petr Salinger ]

Added: trunk/freebsd-utils/debian/patches/fstype_alias.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/fstype_alias.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/fstype_alias.diff	2014-10-26 18:53:37 UTC (rev 5671)
@@ -0,0 +1,33 @@
+From: Steven Chamberlain <steven at pyro.eu.org>
+Subject: accept some Linux-style filesystem names
+Date: Sun, 26 Oct 2014 18:39:08 +0000
+
+--- a/src/sbin/mount/mount.c
++++ b/src/sbin/mount/mount.c
+@@ -584,6 +584,26 @@
+ 		    "Using \"-t msdosfs\", since \"-t msdos\" is deprecated.");
+ 		vfstype = "msdosfs";
+ 	}
++	if (strcmp(vfstype, "ext2") == 0) {
++		warnx(
++		    "Using \"-t ext2fs\" instead of \"-t ext2\".");
++		vfstype = "ext2fs";
++	}
++	if (strcmp(vfstype, "ext3") == 0) {
++		warnx(
++		    "Using \"-t ext3fs\" instead of \"-t ext3\".");
++		vfstype = "ext3fs";
++	}
++	if (strcmp(vfstype, "ext4") == 0) {
++		warnx(
++		    "Using \"-t ext4fs\" instead of \"-t ext4\".");
++		vfstype = "ext4fs";
++	}
++	if (strcmp(vfstype, "cifs") == 0) {
++		warnx(
++		    "Using \"-t smbfs\" instead of \"-t cifs\".");
++		vfstype = "smbfs";
++	}
+ 
+ 	/* Construct the name of the appropriate mount command */
+ 	(void)snprintf(execname, sizeof(execname), "mount_%s", vfstype);

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2014-10-26 18:17:06 UTC (rev 5670)
+++ trunk/freebsd-utils/debian/patches/series	2014-10-26 18:53:37 UTC (rev 5671)
@@ -40,3 +40,4 @@
 netstat_oqdrops.diff
 sysctl.diff
 abi_breaks.diff
+fstype_alias.diff