[Usbmount-commit] r12 - in trunk: usbmount usbmount/debian www
Martin Dickopp
mdickopp-guest@costa.debian.org
Fri, 01 Apr 2005 15:21:20 +0000
Author: mdickopp-guest
Date: 2005-04-01 15:21:20 +0000 (Fri, 01 Apr 2005)
New Revision: 12
Modified:
trunk/usbmount/README
trunk/usbmount/debian/control
trunk/usbmount/debian/postinst
trunk/usbmount/debian/prerm
trunk/usbmount/usbmount.dev
trunk/www/index.html.in
Log:
* Use the same capitalization of the term "USBmount" consistently.
* Mention that a 2.6 (or newer) kernel is required.
* Explain that USBmount is not supposed to interact with a desktop
environment; refer to pmount and hal.
* If configuration variables are not set by /etc/usbmount.conf,
/etc/dev.d/block/usbmount.dev no longer sets them to default values.
* Create /var/run/usbmount when the package is installed, remove it when
the package is removed.
* Include the string #DEBHELPER# in postinst and prerm. (Currently,
debhelper just replaces it with an empty line.)
Modified: trunk/usbmount/README
===================================================================
--- trunk/usbmount/README 2005-03-22 18:16:15 UTC (rev 11)
+++ trunk/usbmount/README 2005-04-01 15:21:20 UTC (rev 12)
@@ -1,15 +1,21 @@
-usbmount
+USBmount
--------
-The usbmount package automatically mounts USB mass storage devices
+The USBmount package automatically mounts USB mass storage devices
(typically USB pens) when they are plugged in, and unmounts them when
they are removed. The mountpoints (/media/usb[0-7] by default),
filesystem types to consider, and mount options are configurable. When
multiple devices are plugged in, the first available mountpoint is
-automatically selected.
+automatically selected. If the device provides a model name, a symbolic
+link /var/run/usbmount/MODELNAME pointing to the mountpoint is auto-
+matically created.
-If the device provides a model name, a symlink /var/run/usbmount/MODELNAME
-pointing to the mountpoint is automatically created.
+The script that does the (un)mounting is called by the udev daemon.
+Therefore, USBmount requires a 2.6 (or newer) kernel.
+USBmount is intended as a lightweight solution which is independent of a
+desktop environment. Users which would like an icon to appear when an
+USB device is plugged in should use the pmount and hal packages instead.
+
The comments in the configuration file /etc/usbmount.conf describe how
to configure the package.
Modified: trunk/usbmount/debian/control
===================================================================
--- trunk/usbmount/debian/control 2005-03-22 18:16:15 UTC (rev 11)
+++ trunk/usbmount/debian/control 2005-04-01 15:21:20 UTC (rev 12)
@@ -20,5 +20,11 @@
created.
.
The script that does the (un)mounting is called by the udev daemon.
+ Therefore, USBmount requires a 2.6 (or newer) kernel.
.
+ USBmount is intended as a lightweight solution which is independent of
+ a desktop environment. Users which would like an icon to appear when an
+ USB device is plugged in should use the pmount and hal packages
+ instead.
+ .
Homepage: http://usbmount.alioth.debian.org/
Modified: trunk/usbmount/debian/postinst
===================================================================
--- trunk/usbmount/debian/postinst 2005-03-22 18:16:15 UTC (rev 11)
+++ trunk/usbmount/debian/postinst 2005-04-01 15:21:20 UTC (rev 12)
@@ -2,13 +2,18 @@
set -e
# If the package is configured for the first time, try to create the
-# default mountpoints. Failure to do so is not considered fatal.
+# default mountpoints and /var/run/usbmount. Failure to do so is not
+# considered fatal.
if test "$1" = configure && test "$2" = ""; then
mkdir /media 2> /dev/null || :
for i in 0 1 2 3 4 5 6 7; do
mkdir /media/usb$i 2> /dev/null || :
done
ln -s usb0 /media/usb 2> /dev/null || :
+
+ mkdir /var/run/usbmount 2> /dev/null || :
fi
+#DEBHELPER#
+
exit 0
Modified: trunk/usbmount/debian/prerm
===================================================================
--- trunk/usbmount/debian/prerm 2005-03-22 18:16:15 UTC (rev 11)
+++ trunk/usbmount/debian/prerm 2005-04-01 15:21:20 UTC (rev 12)
@@ -1,13 +1,17 @@
#!/bin/sh
set -e
-# If the package is removed, try to remove the default mountpoints.
-# Failure to do so is not considered fatal.
+# If the package is removed, try to remove the default mountpoints and
+# /var/run/usbmount. Failure to do so is not considered fatal.
if test "$1" = remove; then
rm -f /media/usb 2> /dev/null || :
for i in 0 1 2 3 4 5 6 7; do
rmdir /media/usb$i 2> /dev/null || :
done
+
+ rm -fr /var/run/usbmount 2> /dev/null || :
fi
+#DEBHELPER#
+
exit 0
Modified: trunk/usbmount/usbmount.dev
===================================================================
--- trunk/usbmount/usbmount.dev 2005-03-22 18:16:15 UTC (rev 11)
+++ trunk/usbmount/usbmount.dev 2005-04-01 15:21:20 UTC (rev 12)
@@ -18,10 +18,9 @@
test -x /usr/share/usbmount/usbmount || exit 0
# Default values for configuration variables.
-MOUNTPOINTS="/media/usb0 /media/usb1 /media/usb2 /media/usb3
- /media/usb4 /media/usb5 /media/usb6 /media/usb7"
-FILESYSTEMS="msdos vfat"
-MOUNTOPTIONS="sync,noexec,nodev,noatime,gid=floppy,dmask=0007,fmask=0117"
+MOUNTPOINTS=""
+FILESYSTEMS=""
+MOUNTOPTIONS=""
VERBOSE="no"
# Read configuration file.
Modified: trunk/www/index.html.in
===================================================================
--- trunk/www/index.html.in 2005-03-22 18:16:15 UTC (rev 11)
+++ trunk/www/index.html.in 2005-04-01 15:21:20 UTC (rev 12)
@@ -24,7 +24,7 @@
<h2><a name="what" class="invlink">What is it?</a></h2>
- <p>The usbmount Debian package automatically mounts <acronym title="Universal Serial Bus">USB</acronym>
+ <p>The USBmount Debian package automatically mounts <acronym title="Universal Serial Bus">USB</acronym>
mass storage devices (typically <acronym title="Universal Serial Bus">USB</acronym> pens) when they are
plugged in, and unmounts them when they are removed. The mountpoints
(<span class="filename">/media/usb<span class="meta">[0-7]</span></span> by default), filesystem types to
@@ -33,8 +33,16 @@
<span class="filename">/var/run/usbmount/<span class="meta">MODELNAME</span></span> pointing to the mountpoint
is automatically created.</p>
- <p>The script that does the (un)mounting is called by the udev daemon.</p>
+ <p>The script that does the (un)mounting is called by the
+ <a href="http://packages.debian.org/udev" title="Description of the udev package.">udev</a> daemon.
+ Therefore, USBmount requires a 2.6 (or newer) kernel.</p>
+ <p>USBmount is intended as a lightweight solution which is independent of a desktop environment.
+ Users which would like an icon to appear when an <acronym title="Universal Serial Bus">USB</acronym> device
+ is plugged in should use the
+ <a href="http://packages.debian.org/pmount" title="Description of the pmount package.">pmount</a> and
+ <a href="http://packages.debian.org/hal" title="Description of the hal package.">hal</a> packages instead.</p>
+
<p>USBmount is licensed under an ‘all-permissive license’ (i.e. everything is allowed, as long
as the copyright and license notices and the warranty disclaimer are preserved). See the
<span class="filename">debian/copyright</span> file in the package for details.</p>