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

[Armin Berres]

Author: trigger-guest
Date: 2007-02-23 17:19:16 +0100 (Fri, 23 Feb 2007)
New Revision: 38

Modified:
   trunk/usbmount/debian/changelog
   trunk/usbmount/usbmount
   trunk/usbmount/usbmount.conf
Log:
add option to disable usbmount

Modified: trunk/usbmount/debian/changelog
===================================================================
--- trunk/usbmount/debian/changelog	2007-02-23 15:23:25 UTC (rev 37)
+++ trunk/usbmount/debian/changelog	2007-02-23 16:19:16 UTC (rev 38)
@@ -1,11 +1,12 @@
 usbmount (0.0.15) unstable; urgency=low
 
-  * New Maintainer (Closes: #408621)
+  * New Maintainer, thanks to Martin Dickopp for all his work (Closes: #408621)
   * Added XS-Vcs-Svn and XS-Vcs-Browser entries
   * Ident homepage with two spaces
-  * recreate /var/run/usbmount if it has been deleted (Closes: #345364)
+  * Recreate /var/run/usbmount if it has been deleted (Closes: #345364)
+  * Add Option to disable usbmount (Closes: #380809)
 
- -- Armin Berres <trigger+debian at space-based.de>  Fri, 23 Feb 2007 16:21:58 +0100
+ -- Armin Berres <trigger+debian at space-based.de>  Fri, 23 Feb 2007 17:12:29 +0100
 
 usbmount (0.0.14.1) unstable; urgency=low
 

Modified: trunk/usbmount/usbmount
===================================================================
--- trunk/usbmount/usbmount	2007-02-23 15:23:25 UTC (rev 37)
+++ trunk/usbmount/usbmount	2007-02-23 16:19:16 UTC (rev 38)
@@ -40,6 +40,7 @@
 test -x /lib/udev/vol_id || { log err "cannnot execute /lib/udev/vol_id"; exit 1; }
 
 # Default values for configuration variables.
+ENABLED=1
 MOUNTPOINTS=""
 FILESYSTEMS=""
 MOUNTOPTIONS=""
@@ -51,6 +52,11 @@
     . /etc/usbmount/usbmount.conf
 fi
 
+if [ "$ENABLED" = "0" ]; then
+    log info "usbmount is disabled, see /etc/usbmount/usbmount.conf"
+    exit 0
+fi
+
 # Recreate /var/run/usbmount/ if it has been deleted
 test -e /var/run/usbmount/ || mkdir /var/run/usbmount/
 

Modified: trunk/usbmount/usbmount.conf
===================================================================
--- trunk/usbmount/usbmount.conf	2007-02-23 15:23:25 UTC (rev 37)
+++ trunk/usbmount/usbmount.conf	2007-02-23 16:19:16 UTC (rev 38)
@@ -2,6 +2,9 @@
 # storage devices when they are plugged in and unmounts them when they
 # are removed.
 
+# Change to zero to disable usbmount
+ENABLED=1
+
 # Mountpoints: These directories are eligible as mointpoints for USB
 # mass storage devices.  A newly plugged in device is mounted on the
 # first directory in this list that exists and on which nothing is