[Usbmount-commit] r54 - in usbmount/branches/fix-race-condition: . debian

[Rogério Brito]

Author: rbrito-guest
Date: 2009-08-18 11:53:11 +0000 (Tue, 18 Aug 2009)
New Revision: 54

Modified:
   usbmount/branches/fix-race-condition/debian/changelog
   usbmount/branches/fix-race-condition/debian/control
   usbmount/branches/fix-race-condition/usbmount
   usbmount/branches/fix-race-condition/usbmount.conf
Log:
Fix race condition in package.


Modified: usbmount/branches/fix-race-condition/debian/changelog
===================================================================
--- usbmount/branches/fix-race-condition/debian/changelog	2009-08-18 11:39:21 UTC (rev 53)
+++ usbmount/branches/fix-race-condition/debian/changelog	2009-08-18 11:53:11 UTC (rev 54)
@@ -1,3 +1,17 @@
+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>  Tue, 18 Aug 2009 08:45:55 -0300
+
 usbmount (0.0.17) unstable; urgency=low
 
   * The "More Documentation, Please" release.

Modified: usbmount/branches/fix-race-condition/debian/control
===================================================================
--- usbmount/branches/fix-race-condition/debian/control	2009-08-18 11:39:21 UTC (rev 53)
+++ usbmount/branches/fix-race-condition/debian/control	2009-08-18 11:53:11 UTC (rev 54)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 Source: usbmount
 Section: admin
 Priority: extra
@@ -7,7 +8,7 @@
 Vcs-Browser: http://svn.debian.org/wsvn/usbmount
 DM-Upload-Allowed: yes
 Uploaders: Rafael Laboissiere <rafael at debian.org>
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://usbmount.alioth.debian.org/
 
 Package: usbmount

Modified: usbmount/branches/fix-race-condition/usbmount
===================================================================
--- usbmount/branches/fix-race-condition/usbmount	2009-08-18 11:39:21 UTC (rev 53)
+++ usbmount/branches/fix-race-condition/usbmount	2009-08-18 11:53:11 UTC (rev 54)
@@ -68,12 +68,11 @@
 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

Modified: usbmount/branches/fix-race-condition/usbmount.conf
===================================================================
--- usbmount/branches/fix-race-condition/usbmount.conf	2009-08-18 11:39:21 UTC (rev 53)
+++ usbmount/branches/fix-race-condition/usbmount.conf	2009-08-18 11:53:11 UTC (rev 54)
@@ -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!                                                                  #
@@ -28,7 +28,7 @@
 # Mount options: Options passed to the mount command with the -o flag.
 # See the warning above regarding removing "sync" from the options, as
 # it may lead to data loss.
-MOUNTOPTIONS="sync,noexec,nodev,noatime"
+MOUNTOPTIONS="sync,noexec,nodev,noatime,nodiratime"
 
 # Filesystem type specific mount options: This variable contains a space
 # separated list of strings, each which the form "-fstype=TYPE,OPTIONS".