[Glibc-bsd-commits] r2496 - in trunk/ufsutils/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2009-05-05 09:04:39 +0000 (Tue, 05 May 2009)
New Revision: 2496

Modified:
   trunk/ufsutils/debian/changelog
   trunk/ufsutils/debian/patches/01_libufs.patch
Log:
 * Allow mkfs.ufs not only on character devices (GNU/kFreeBSD), but also
   on block devices (Linux) and plain files (i.e. loopback).



Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog	2009-05-05 07:03:35 UTC (rev 2495)
+++ trunk/ufsutils/debian/changelog	2009-05-05 09:04:39 UTC (rev 2496)
@@ -16,6 +16,8 @@
 
   [ Petr Salinger ]
   * New upstream version (RELENG_7_2_0_RELEASE)
+  * Allow mkfs.ufs not only on character devices (GNU/kFreeBSD), but also
+    on block devices (Linux) and plain files (i.e. loopback). (Closes: #526586)
 
  -- Guillem Jover <guillem at debian.org>  Mon, 04 May 2009 12:00:00 +0200
 

Modified: trunk/ufsutils/debian/patches/01_libufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/01_libufs.patch	2009-05-05 07:03:35 UTC (rev 2495)
+++ trunk/ufsutils/debian/patches/01_libufs.patch	2009-05-05 09:04:39 UTC (rev 2496)
@@ -2,6 +2,15 @@
 ===================================================================
 --- ufsutils.orig/libufs/type.c
 +++ ufsutils/libufs/type.c
+@@ -108,7 +108,7 @@
+ 		 */
+ 		name = oname;
+ 	}
+-	if (ret >= 0 && S_ISCHR(st.st_mode)) {
++	if (ret >= 0 && (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode) || S_ISREG(st.st_mode))) {
+ 		/* This is what we need, do nothing. */
+ 		;
+ 	} else if ((fs = getfsfile(name)) != NULL) {
 @@ -131,8 +131,10 @@
  			ERROR(disk, "could not find special device");
  			return (-1);
@@ -9,11 +18,10 @@
 +#if HAVE_BSD_STATFS
  		strlcpy(dev, sfs.f_mntfromname, sizeof(dev));
  		name = dev;
-+#endif		
++#endif
  	} else {
  		ERROR(disk, "could not find special device");
  		return (-1);
-
 Index: ufsutils/include/ufs/ffs/fs.h
 ===================================================================
 --- ufsutils.orig/include/ufs/ffs/fs.h
@@ -59,7 +67,7 @@
 --- ufsutils.orig/libufs/Makefile
 +++ ufsutils/libufs/Makefile
 @@ -1,26 +1,16 @@
- # $FreeBSD: src/lib/libufs/Makefile,v 1.14 2006/10/31 21:21:48 pjd Exp $
+ # $FreeBSD: src/lib/libufs/Makefile,v 1.14.8.1 2009/04/15 03:14:26 kensmith Exp $
  
  LIB=	ufs
 -SHLIBDIR?= /lib