[Usbmount-commit] r57 - in usbmount/trunk: . debian

Rogério Brito rbrito-guest at alioth.debian.org
Tue Oct 20 21:14:31 UTC 2009


Author: rbrito-guest
Date: 2009-10-20 21:14:31 +0000 (Tue, 20 Oct 2009)
New Revision: 57

Modified:
   usbmount/trunk/debian/changelog
   usbmount/trunk/debian/control
   usbmount/trunk/debian/copyright
   usbmount/trunk/usbmount
   usbmount/trunk/usbmount.conf
Log:
Preparation for next release.


Modified: usbmount/trunk/debian/changelog
===================================================================
--- usbmount/trunk/debian/changelog	2009-08-26 05:13:37 UTC (rev 56)
+++ usbmount/trunk/debian/changelog	2009-10-20 21:14:31 UTC (rev 57)
@@ -1,11 +1,35 @@
 usbmount (0.0.18) unstable; urgency=low
 
+  * usbmount:
+    + migrate from vol_id to blkid; patch adapted from gregoa. (Closes: #548627)
+    + include extra debugging points.
+  * usbmount.rules:
+    + update rules for new naming scheme of recent kernels/udev combo.
+  * debian/NEWS:
+    + really include the file (Closes: #548785).
+  * debian/control:
+    + update standards version to 3.8.3 (no changes necessary).
+    + reorder fields.
+    + remove uploaders; Rafael is welcome any time he wants to.
+  * debian/copyright:
+    + fix my e-mail address.
+    + consolidate entries.
+
+ -- Rogério Brito <rbrito at ime.usp.br>  Tue, 20 Oct 2009 18:30:39 -0200
+
+usbmount (0.0.17.1) unstable; urgency=low
+
+  * usbmount:
+    + revert patch from #403209 (seems to introduce race conditions)
+      (Closes: #535238)
   * usbmount.conf:
+    + include ext4 so that it can be mounted automatically.
     + add MOUNTOPTIONS nodiratime. Closes: #539386. (Tks Jari Aalto)
   * debian/control:
+    + include comment (allowed by policy).
     + update standards version to 3.8.2 (no changes necessary).
 
- -- Rogério Brito <rbrito at ime.usp.br>  Fri, 31 Jul 2009 13:26:04 -0300
+ -- Rogério Brito <rbrito at ime.usp.br>  Tue, 18 Aug 2009 08:45:55 -0300
 
 usbmount (0.0.17) unstable; urgency=low
 

Modified: usbmount/trunk/debian/control
===================================================================
--- usbmount/trunk/debian/control	2009-08-26 05:13:37 UTC (rev 56)
+++ usbmount/trunk/debian/control	2009-10-20 21:14:31 UTC (rev 57)
@@ -1,13 +1,13 @@
+# -*- coding: utf-8 -*-
 Source: usbmount
 Section: admin
 Priority: extra
+Standards-Version: 3.8.3
+Build-Depends: cdbs, debhelper (>= 5)
 Maintainer: Rogério Brito <rbrito at ime.usp.br>
-Build-Depends: cdbs, debhelper (>= 5)
+DM-Upload-Allowed: yes
 Vcs-Svn: svn://svn.debian.org/svn/usbmount/usbmount/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/usbmount
-DM-Upload-Allowed: yes
-Uploaders: Rafael Laboissiere <rafael at debian.org>
-Standards-Version: 3.8.2
 Homepage: http://usbmount.alioth.debian.org/
 
 Package: usbmount

Modified: usbmount/trunk/debian/copyright
===================================================================
--- usbmount/trunk/debian/copyright	2009-08-26 05:13:37 UTC (rev 56)
+++ usbmount/trunk/debian/copyright	2009-10-20 21:14:31 UTC (rev 57)
@@ -1,4 +1,3 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
 Author: Martin Dickopp <martin at zero-based.org>
 Upstream-Name: usbmount
 Upstream-Maintainer: Rogério Brito <rbrito at ime.usp.br>
@@ -7,41 +6,6 @@
 
 Files: *
 Copyright: © 2004, 2005, 2006, 2007 Martin Dickopp <martin at zero-based.org>
-License: BSD-2
-  This package is free software; the copyright holder gives unlimited
-  permission to copy and/or distribute it, with or without
-  modifications, as long as this notice is preserved.
-
-  This package is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-  even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.
-
-Files: *
-Copyright: © 2009 Rogério Brito <rbrito at zero-based.org>
-License: BSD-2
-  This package is free software; the copyright holder gives unlimited
-  permission to copy and/or distribute it, with or without
-  modifications, as long as this notice is preserved.
-
-  This package is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-  even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.
-
-Files: debian/*
-Copyright: © 2004, 2005, 2006, 2007 Martin Dickopp <martin at zero-based.org>
-License: BSD-2
-  This package is free software; the copyright holder gives unlimited
-  permission to copy and/or distribute it, with or without
-  modifications, as long as this notice is preserved.
-
-  This package is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-  even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.
-
-Files: debian/*
 Copyright: © 2008, 2009 Rogério Brito <rbrito at ime.usp.br>
 License: BSD-2
   This package is free software; the copyright holder gives unlimited

Modified: usbmount/trunk/usbmount
===================================================================
--- usbmount/trunk/usbmount	2009-08-26 05:13:37 UTC (rev 56)
+++ usbmount/trunk/usbmount	2009-10-20 21:14:31 UTC (rev 57)
@@ -20,9 +20,6 @@
 # Auxiliary functions 
 
 # Log a string via the syslog facility.
-# Parameters:
-#  * the level of the message.
-#  * the message.
 log()
 {
     if test $1 != debug || expr "$VERBOSE" : "[yY]" > /dev/null; then
@@ -30,6 +27,7 @@
     fi
 }
 
+
 # Test if the first parameter is in the list given by the second
 # parameter.
 in_list()
@@ -40,45 +38,7 @@
     return 1
 }
 
-# # Check if usbmount should be run.
-# check_if_usbmount_is_enabled()
-# {
-#     if [ "${ENABLED:-1}" -eq "0" ]; then
-# 	log info "usbmount is disabled, see /etc/usbmount/usbmount.conf"
-# 	exit 0
-#     fi
-# }
 
-# # Test if /lib/udev/vol_id is executable.
-# check_if_vol_id_is_usable()
-# {
-#     if [ ! -x /lib/udev/vol_id ]; then
-# 	log err "cannot execute /lib/udev/vol_id"
-# 	exit 1
-#     fi
-# }
-
-# # Read configuration file.
-# read_configuration_file()
-# {
-#     if [ -r /etc/usbmount/usbmount.conf ]; then
-# 	. /etc/usbmount/usbmount.conf
-# 	log debug "loaded usbmount configurations"
-#     fi
-# }
-
-# # Create /var/run/usbmount.
-# # Per Debian Policy 9.3.2, directories under /var/run/usbmount have
-# # to be checked after every reboot.
-# create_var_run_usbmount()
-# {
-#     if [ ! -e /var/run/usbmount ]; then
-# 	mkdir -p /var/run/usbmount
-# 	log debug "creating /var/run/usbmount directory"
-#     fi
-# }
-
-
 ######################################################################
 # Main program
 
@@ -90,44 +50,41 @@
 FS_MOUNTOPTIONS=""
 VERBOSE="no"
 
+# Read configuration file.
 if [ -r /etc/usbmount/usbmount.conf ]; then
     . /etc/usbmount/usbmount.conf
     log debug "loaded usbmount configurations"
 fi
 
+# Check if usbmount should be run.
 if [ "${ENABLED:-1}" -eq "0" ]; then
     log info "usbmount is disabled, see /etc/usbmount/usbmount.conf"
     exit 0
 fi
 
-if [ ! -x /lib/udev/vol_id ]; then
-    log err "cannot execute /lib/udev/vol_id"
+# Test if blkid is executable.
+if [ ! -x /sbin/blkid ]; then
+    log err "cannot execute /sbin/blkid"
     exit 1
 fi
 
+# Per Policy 9.3.2, directories under /var/run/usbmount have to be checked
+# after every reboot.
 if [ ! -e /var/run/usbmount ]; then
     mkdir -p /var/run/usbmount
     log debug "creating /var/run/usbmount directory"
 fi
 
-
-#read_configuration_file
-#check_if_enabled
-#check_if_vol_id_is_usable
-#create_var_run_usbmount
-#log debug "finishing usbmount configuration"
-
 umask 022
 
 if test "$1" = add; then
 
     # Acquire lock.
-    LOCKFILE=/var/run/usbmount/.mount`echo "$DEVNAME" | sed 's%[^a-z0-9_]%-%g'`
-    log debug "trying to acquire lock $LOCKFILE.lock"
-    lockfile-create --retry 3 $LOCKFILE ||
-	{ log err "cannot acquire lock $LOCKFILE.lock"; exit 1; }
-    trap '( lockfile-remove $LOCKFILE )' 0
-    log debug "acquired lock $LOCKFILE.lock"
+    log debug "trying to acquire lock /var/run/usbmount/.mount.lock"
+    lockfile-create --retry 3 /var/run/usbmount/.mount || \
+	{ log err "cannot acquire lock /var/run/usbmount/.mount.lock"; exit 1; }
+    trap '( lockfile-remove /var/run/usbmount/.mount )' 0
+    log debug "acquired lock /var/run/usbmount/.mount.lock"
 
     # Try to read from the device.  Some devices need a few seconds
     # initialization time before they can be accessed.  Give up after
@@ -160,10 +117,10 @@
     # Test if the device contains a filesystem.  If it doesn't, no
     # further action is required, but calling vol_id has the side effect
     # that the partition table is read and partition devices are created.
-    elif /lib/udev/vol_id "$DEVNAME" | egrep -q '^ID_FS_USAGE=(filesystem|disklabel)$'; then
+    elif /sbin/blkid -p -o udev "$DEVNAME" | egrep -q '^ID_FS_USAGE=(filesystem|disklabel)$'; then
 	log debug "$DEVNAME contains a filesystem or disklabel"
 
-	fstype="`/lib/udev/vol_id -t \"$DEVNAME\"`"
+	fstype="`/sbin/blkid -s TYPE -o value \"$DEVNAME\"`"
 	log debug "$DEVNAME contains filesystem type $fstype"
 
 	# Test if the filesystem type is in the list of filesystem

Modified: usbmount/trunk/usbmount.conf
===================================================================
--- usbmount/trunk/usbmount.conf	2009-08-26 05:13:37 UTC (rev 56)
+++ usbmount/trunk/usbmount.conf	2009-10-20 21:14:31 UTC (rev 57)
@@ -14,7 +14,7 @@
 
 # Filesystem types: USB mass storage devices are only mounted if they
 # contain a filesystem type which is in this list.
-FILESYSTEMS="vfat ext2 ext3 hfsplus"
+FILESYSTEMS="vfat ext2 ext3 ext4 hfsplus"
 
 #############################################################################
 # WARNING!                                                                  #




More information about the Usbmount-commit mailing list