[Usbmount-commit] r13 - in trunk: usbmount usbmount/debian www www/package
Martin Dickopp
mdickopp-guest@costa.debian.org
Sun, 03 Apr 2005 22:10:06 +0000
Author: mdickopp-guest
Date: 2005-04-03 22:10:05 +0000 (Sun, 03 Apr 2005)
New Revision: 13
Added:
trunk/www/package/usbmount_0.0.8.dsc
trunk/www/package/usbmount_0.0.8.tar.gz
trunk/www/package/usbmount_0.0.8_all.deb
trunk/www/package/usbmount_0.0.8_amd64.changes
Modified:
trunk/usbmount/debian/changelog
trunk/usbmount/debian/control
trunk/usbmount/usbmount
trunk/usbmount/usbmount.conf
trunk/usbmount/usbmount.dev
trunk/www/index.html.in
Log:
* Filesystem type specific mount options can be specified.
* Use locking in the /usr/share/usbmount/usbmount script to serialize
concurrent mount attempts. This ensures that different mount points
are chosen if a device contains more than one mountable partition.
* New package (version 0.0.8).
Modified: trunk/usbmount/debian/changelog
===================================================================
--- trunk/usbmount/debian/changelog 2005-04-01 15:21:20 UTC (rev 12)
+++ trunk/usbmount/debian/changelog 2005-04-03 22:10:05 UTC (rev 13)
@@ -1,3 +1,15 @@
+usbmount (0.0.8) unstable; urgency=low
+
+ * Upload sponsored by Rafael Laboissiere (closes: #298526).
+ * Filesystem type specific mount options can be specified.
+ * Use locking to serialize concurrent mount attempts. This ensures that
+ different mount points are chosen if a device contains more than one
+ mountable partition.
+ * Make sure that /var/run/usbmount is removed on package removal.
+ * More detailed package description and README file.
+
+ -- Martin Dickopp <martin@zero-based.org> Sun, 3 Apr 2005 23:40:25 +0200
+
usbmount (0.0.7) unstable; urgency=low
Rafael Laboissiere:
Modified: trunk/usbmount/debian/control
===================================================================
--- trunk/usbmount/debian/control 2005-04-01 15:21:20 UTC (rev 12)
+++ trunk/usbmount/debian/control 2005-04-03 22:10:05 UTC (rev 13)
@@ -8,7 +8,7 @@
Package: usbmount
Architecture: all
-Depends: udev (>= 0.053-1)
+Depends: udev (>= 0.053-1), lockfile-progs
Description: automatically mount and unmount USB mass storage devices
This package automatically mounts USB mass storage devices (typically
USB pens) when they are plugged in, and unmounts them when they are
Modified: trunk/usbmount/usbmount
===================================================================
--- trunk/usbmount/usbmount 2005-04-01 15:21:20 UTC (rev 12)
+++ trunk/usbmount/usbmount 2005-04-03 22:10:05 UTC (rev 13)
@@ -68,6 +68,12 @@
# Test if the filesystem type is in the list of filesystem
# types to mount.
if in_list "$fstype" "$FILESYSTEMS"; then
+ # Acquire lock.
+ log debug "trying to acquire lock"
+ lockfile-create --retry 3 /var/run/usbmount/.mount || \
+ { log error "cannot acquire lock /var/run/usbmount/.mount.lock"; exit 1; }
+ trap '( lockfile-remove /var/run/usbmount/.mount )' 0
+
# Search an available mountpoint.
for v in $MOUNTPOINTS; do
if test -d "$v" \
@@ -78,12 +84,22 @@
fi
done
if test -n "$mountpoint"; then
- # Mount the filesystem.
+ # Determine mount options.
+ options=
+ for v in $FS_MOUNTOPTIONS; do
+ if expr "$v" : "-fstype=$fstype,."; then
+ options="`echo \"$v\" | sed 's/^[^,]*,//'`"
+ break
+ fi
+ done
if test -n "$MOUNTOPTIONS"; then
- options="-o $MOUNTOPTIONS"
- else
- options=
+ options="$MOUNTOPTIONS${options:+,$options}"
fi
+ if test -n "$options"; then
+ options="-o $options"
+ fi
+
+ # Mount the filesystem.
log info "executing command: mount -t $fstype $options $DEVNAME $mountpoint"
mount -t "$fstype" $options "$DEVNAME" "$mountpoint"
@@ -97,10 +113,6 @@
fi
model="`echo \"$model\" | sed 's/^[ ]*//; s/[ ]*$//; s/[ ]/_/g; s/[^0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ._-]//g'`"
if test "$model" != ""; then
- if ! test -d /var/run/usbmount; then
- log info "creating directory /var/run/usbmount"
- mkdir /var/run/usbmount
- fi
if ! test -e "/var/run/usbmount/$model"; then
log info "creating symlink /var/run/usbmount/$model -> $mountpoint"
ln -sf "$mountpoint" "/var/run/usbmount/$model"
Modified: trunk/usbmount/usbmount.conf
===================================================================
--- trunk/usbmount/usbmount.conf 2005-04-01 15:21:20 UTC (rev 12)
+++ trunk/usbmount/usbmount.conf 2005-04-03 22:10:05 UTC (rev 13)
@@ -13,9 +13,9 @@
# contain a filesystem type which is in this list.
#############################################################################
# WARNING! The vfat filesystem does not yet fully implement sync-mounting. #
-# If you include 'vfat' in the list of filesystem types, you *MUST* make #
+# If you include "vfat" in the list of filesystem types, you *MUST* make #
# sure all data is written to the medium before you remove it (e.g. run the #
-# 'sync' command in a terminal window). Otherwise, you *WILL* lose data! #
+# "sync" command in a terminal window). Otherwise, you *WILL* lose data! #
#############################################################################
FILESYSTEMS="ext2 ext3"
@@ -24,6 +24,14 @@
# might result in severe data loss.
MOUNTOPTIONS="sync,noexec,nodev,noatime"
+# Filesystem type specific mount options: This variable contains a space sepa-
+# rated list of strings, each of which has the form "-fstype=TYPE,OPTIONS".
+# If a filesystem with a type listed here is mounted, the corresponding
+# options are appended to those specificed in the MOUNTOPTIONS variable.
+# For example, "-fstype=vfat,gid=floppy,dmask=0007,fmask=0117" would add the
+# options "gid=floppy,dmask=0007,fmask=0117" when a vfat filesystem is mounted.
+FS_MOUNTOPTIONS=""
+
# If set to "yes", more information will be logged via the syslog
# facility.
VERBOSE="no"
Modified: trunk/usbmount/usbmount.dev
===================================================================
--- trunk/usbmount/usbmount.dev 2005-04-01 15:21:20 UTC (rev 12)
+++ trunk/usbmount/usbmount.dev 2005-04-03 22:10:05 UTC (rev 13)
@@ -1,7 +1,7 @@
#!/bin/sh
# This script mounts USB mass storage devices when they are plugged in
# and unmounts them when they are removed.
-# Copyright (C) 2004 Martin Dickopp
+# Copyright (C) 2004, 2005 Martin Dickopp
#
# This file is free software; the copyright holder gives unlimited
# permission to copy and/or distribute it, with or without
@@ -21,6 +21,7 @@
MOUNTPOINTS=""
FILESYSTEMS=""
MOUNTOPTIONS=""
+FS_MOUNTOPTIONS=""
VERBOSE="no"
# Read configuration file.
@@ -32,5 +33,6 @@
export MOUNTPOINTS
export FILESYSTEMS
export MOUNTOPTIONS
+export FS_MOUNTOPTIONS
export VERBOSE
exec /usr/share/usbmount/usbmount "$@"
Modified: trunk/www/index.html.in
===================================================================
--- trunk/www/index.html.in 2005-04-01 15:21:20 UTC (rev 12)
+++ trunk/www/index.html.in 2005-04-03 22:10:05 UTC (rev 13)
@@ -62,18 +62,18 @@
<ul>
<li>Source:
<ul>
- <li><a href="package/usbmount_0.0.7.dsc">usbmount_0.0.7.dsc</a></li>
- <li><a href="package/usbmount_0.0.7.tar.gz">usbmount_0.0.7.tar.gz</a></li>
+ <li><a href="package/usbmount_0.0.8.dsc">usbmount_0.0.8.dsc</a></li>
+ <li><a href="package/usbmount_0.0.8.tar.gz">usbmount_0.0.8.tar.gz</a></li>
</ul></li>
<li>Binary:
<ul>
- <li><a href="package/usbmount_0.0.7_all.deb">usbmount_0.0.7_all.deb</a></li>
+ <li><a href="package/usbmount_0.0.8_all.deb">usbmount_0.0.8_all.deb</a></li>
</ul></li>
<li>Changes:
<ul>
- <li><a href="package/usbmount_0.0.7_amd64.changes">usbmount_0.0.7_amd64.changes</a></li>
+ <li><a href="package/usbmount_0.0.8_amd64.changes">usbmount_0.0.8_amd64.changes</a></li>
</ul></li>
</ul>
@@ -98,8 +98,17 @@
<h2><a name="history" class="invlink">History</a></h2>
<ul>
- <li>Version 0.0.7 (09-Mar-2005, latest release):
+ <li>Version 0.0.8 (03-Apr-2005, latest release):
<ul>
+ <li>Filesystem type specific mount options can be specified.</li>
+ <li>Locking is used to serialize concurrent mount attempts. This ensures that different mount points
+ are chosen if a device contains more than one mountable partition.</li>
+ <li>Make sure that <span class="filename">/var/run/usbmount</span> is removed on package removal.</li>
+ <li>More detailed package description and <span class="filename">README</span> file.</li>
+ </ul></li>
+
+ <li>Version 0.0.7 (09-Mar-2005):
+ <ul>
<li>The default configuration does not mount vfat filesystems any more. The vfat filesystem type
does not fully support sync-mounting. The default configuration file warns about this.</li>
<li>The package description refers to this page instead of the old homepage.</li>
Added: trunk/www/package/usbmount_0.0.8.dsc
===================================================================
--- trunk/www/package/usbmount_0.0.8.dsc 2005-04-01 15:21:20 UTC (rev 12)
+++ trunk/www/package/usbmount_0.0.8.dsc 2005-04-03 22:10:05 UTC (rev 13)
@@ -0,0 +1,11 @@
+Format: 1.0
+Source: usbmount
+Version: 0.0.8
+Binary: usbmount
+Maintainer: Martin Dickopp <martin@zero-based.org>
+Architecture: all
+Standards-Version: 3.6.1
+Build-Depends-Indep: cdbs, debhelper (>= 4.1.0)
+Uploaders: Rafael Laboissiere <rafael@debian.org>
+Files:
+ 2c36b063367e8a36efe092f194f356ed 5551 usbmount_0.0.8.tar.gz
Added: trunk/www/package/usbmount_0.0.8.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/www/package/usbmount_0.0.8.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/www/package/usbmount_0.0.8_all.deb
===================================================================
(Binary files differ)
Property changes on: trunk/www/package/usbmount_0.0.8_all.deb
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/www/package/usbmount_0.0.8_amd64.changes
===================================================================
--- trunk/www/package/usbmount_0.0.8_amd64.changes 2005-04-01 15:21:20 UTC (rev 12)
+++ trunk/www/package/usbmount_0.0.8_amd64.changes 2005-04-03 22:10:05 UTC (rev 13)
@@ -0,0 +1,27 @@
+Format: 1.7
+Date: Sun, 3 Apr 2005 23:40:25 +0200
+Source: usbmount
+Binary: usbmount
+Architecture: source all
+Version: 0.0.8
+Distribution: unstable
+Urgency: low
+Maintainer: Martin Dickopp <martin@zero-based.org>
+Changed-By: Martin Dickopp <martin@zero-based.org>
+Description:
+ usbmount - automatically mount and unmount USB mass storage devices
+Closes: 298526
+Changes:
+ usbmount (0.0.8) unstable; urgency=low
+ .
+ * Upload sponsored by Rafael Laboissiere (closes: #298526).
+ * Filesystem type specific mount options can be specified.
+ * Use locking to serialize concurrent mount attempts. This ensures that
+ different mount points are chosen if a device contains more than one
+ mountable partition.
+ * Make sure that /var/run/usbmount is removed on package removal.
+ * More detailed package description and README file.
+Files:
+ f35dfc30ee7e2543f20b43d76dffcecd 322 admin extra usbmount_0.0.8.dsc
+ 2c36b063367e8a36efe092f194f356ed 5551 admin extra usbmount_0.0.8.tar.gz
+ 6bac36a27d296d7148a1c166f6c608b3 7132 admin extra usbmount_0.0.8_all.deb