[Usbmount-commit] r43 - in usbmount: tags tags/0.0.16 tags/0.0.16/debian trunk trunk/debian

rbrito-guest at alioth.debian.org rbrito-guest at alioth.debian.org
Sun Oct 19 12:27:16 UTC 2008


Author: rbrito-guest
Date: 2008-10-19 12:27:16 +0000 (Sun, 19 Oct 2008)
New Revision: 43

Added:
   usbmount/tags/0.0.16/
Modified:
   usbmount/tags/0.0.16/debian/changelog
   usbmount/tags/0.0.16/debian/control
   usbmount/tags/0.0.16/usbmount
   usbmount/tags/0.0.16/usbmount.conf
   usbmount/tags/0.0.16/usbmount.rules
   usbmount/trunk/debian/changelog
   usbmount/trunk/debian/control
   usbmount/trunk/usbmount
   usbmount/trunk/usbmount.conf
   usbmount/trunk/usbmount.rules
Log:
New version 0.0.16, including firewire support. :-)


Copied: usbmount/tags/0.0.16 (from rev 41, usbmount/trunk)


Property changes on: usbmount/tags/0.0.16
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: usbmount/tags/0.0.16/debian/changelog
===================================================================
--- usbmount/trunk/debian/changelog	2008-10-19 08:46:37 UTC (rev 41)
+++ usbmount/tags/0.0.16/debian/changelog	2008-10-19 12:27:16 UTC (rev 43)
@@ -1,3 +1,13 @@
+usbmount (0.0.16) unstable; urgency=low
+
+  * debian/control: include Vcs-* fields with modifications.
+  * usbmount.conf: option to disable usbmount. (Closes: #380809)
+  * usbmount.conf: recreate /var/run/usbmount if non-existent. (Closes: #345364)
+    (Tks Armin Berres for the inspiration above)
+  * usbmount.rules: add support for firewire devices too. (Closes: #502687)
+  
+ -- Rogério Brito <rbrito at ime.usp.br>  Sun, 19 Oct 2008 07:35:56 -0200
+
 usbmount (0.0.15.1) unstable; urgency=low
 
   * debian/control: actually include the DM-Upload-Allowed field.

Modified: usbmount/tags/0.0.16/debian/control
===================================================================
--- usbmount/trunk/debian/control	2008-10-19 08:46:37 UTC (rev 41)
+++ usbmount/tags/0.0.16/debian/control	2008-10-19 12:27:16 UTC (rev 43)
@@ -3,6 +3,8 @@
 Priority: extra
 Maintainer: Rogério Brito <rbrito at ime.usp.br>
 Build-Depends: cdbs, debhelper (>= 5)
+Vcs-Svn: svn://svn.debian.org/svn/usbmount/usbmount/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/usbmount
 DM-Upload-Allowed: yes
 Standards-Version: 3.8.0
 Homepage: http://usbmount.alioth.debian.org/

Modified: usbmount/tags/0.0.16/usbmount
===================================================================
--- usbmount/trunk/usbmount	2008-10-19 08:46:37 UTC (rev 41)
+++ usbmount/tags/0.0.16/usbmount	2008-10-19 12:27:16 UTC (rev 43)
@@ -2,6 +2,7 @@
 # This script mounts USB mass storage devices when they are plugged in
 # and unmounts them when they are removed.
 # Copyright (C) 2004, 2005 Martin Dickopp
+# Copyright (C) 2008 Rogério Brito
 #
 # This file is free software; the copyright holder gives unlimited
 # permission to copy and/or distribute it, with or without
@@ -40,6 +41,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,7 +53,15 @@
     . /etc/usbmount/usbmount.conf
 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
 
+# Create /var/run/usbmount/ if it does not exist.
+test -e /var/run/usbmount/ || mkdir /var/run/usbmount/
+
 umask 022
 
 if test "$1" = add; then

Modified: usbmount/tags/0.0.16/usbmount.conf
===================================================================
--- usbmount/trunk/usbmount.conf	2008-10-19 08:46:37 UTC (rev 41)
+++ usbmount/tags/0.0.16/usbmount.conf	2008-10-19 12:27:16 UTC (rev 43)
@@ -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

Modified: usbmount/tags/0.0.16/usbmount.rules
===================================================================
--- usbmount/trunk/usbmount.rules	2008-10-19 08:46:37 UTC (rev 41)
+++ usbmount/tags/0.0.16/usbmount.rules	2008-10-19 12:27:16 UTC (rev 43)
@@ -1,6 +1,7 @@
-# Rules for USBmount
+# Rules for USBmount -*- conf -*-
 
-KERNEL=="sd*", BUS=="usb", ACTION=="add",    RUN+="/usr/share/usbmount/usbmount add"
-KERNEL=="ub*", BUS=="usb", ACTION=="add",    RUN+="/usr/share/usbmount/usbmount add"
-KERNEL=="sd*",             ACTION=="remove", RUN+="/usr/share/usbmount/usbmount remove"
-KERNEL=="ub*",             ACTION=="remove", RUN+="/usr/share/usbmount/usbmount remove"
+KERNEL=="sd*", DRIVERS=="sbp2",	ACTION=="add",	RUN+="/usr/share/usbmount/usbmount add"
+KERNEL=="sd*", BUS=="usb",	ACTION=="add",	RUN+="/usr/share/usbmount/usbmount add"
+KERNEL=="ub*", BUS=="usb",	ACTION=="add",	RUN+="/usr/share/usbmount/usbmount add"
+KERNEL=="sd*",			ACTION=="remove", RUN+="/usr/share/usbmount/usbmount remove"
+KERNEL=="ub*",			ACTION=="remove", RUN+="/usr/share/usbmount/usbmount remove"

Modified: usbmount/trunk/debian/changelog
===================================================================
--- usbmount/trunk/debian/changelog	2008-10-19 09:24:00 UTC (rev 42)
+++ usbmount/trunk/debian/changelog	2008-10-19 12:27:16 UTC (rev 43)
@@ -1,3 +1,13 @@
+usbmount (0.0.16) unstable; urgency=low
+
+  * debian/control: include Vcs-* fields with modifications.
+  * usbmount.conf: option to disable usbmount. (Closes: #380809)
+  * usbmount.conf: recreate /var/run/usbmount if non-existent. (Closes: #345364)
+    (Tks Armin Berres for the inspiration above)
+  * usbmount.rules: add support for firewire devices too. (Closes: #502687)
+  
+ -- Rogério Brito <rbrito at ime.usp.br>  Sun, 19 Oct 2008 07:35:56 -0200
+
 usbmount (0.0.15.1) unstable; urgency=low
 
   * debian/control: actually include the DM-Upload-Allowed field.

Modified: usbmount/trunk/debian/control
===================================================================
--- usbmount/trunk/debian/control	2008-10-19 09:24:00 UTC (rev 42)
+++ usbmount/trunk/debian/control	2008-10-19 12:27:16 UTC (rev 43)
@@ -3,6 +3,8 @@
 Priority: extra
 Maintainer: Rogério Brito <rbrito at ime.usp.br>
 Build-Depends: cdbs, debhelper (>= 5)
+Vcs-Svn: svn://svn.debian.org/svn/usbmount/usbmount/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/usbmount
 DM-Upload-Allowed: yes
 Standards-Version: 3.8.0
 Homepage: http://usbmount.alioth.debian.org/

Modified: usbmount/trunk/usbmount
===================================================================
--- usbmount/trunk/usbmount	2008-10-19 09:24:00 UTC (rev 42)
+++ usbmount/trunk/usbmount	2008-10-19 12:27:16 UTC (rev 43)
@@ -2,6 +2,7 @@
 # This script mounts USB mass storage devices when they are plugged in
 # and unmounts them when they are removed.
 # Copyright (C) 2004, 2005 Martin Dickopp
+# Copyright (C) 2008 Rogério Brito
 #
 # This file is free software; the copyright holder gives unlimited
 # permission to copy and/or distribute it, with or without
@@ -40,6 +41,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,7 +53,15 @@
     . /etc/usbmount/usbmount.conf
 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
 
+# Create /var/run/usbmount/ if it does not exist.
+test -e /var/run/usbmount/ || mkdir /var/run/usbmount/
+
 umask 022
 
 if test "$1" = add; then

Modified: usbmount/trunk/usbmount.conf
===================================================================
--- usbmount/trunk/usbmount.conf	2008-10-19 09:24:00 UTC (rev 42)
+++ usbmount/trunk/usbmount.conf	2008-10-19 12:27:16 UTC (rev 43)
@@ -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

Modified: usbmount/trunk/usbmount.rules
===================================================================
--- usbmount/trunk/usbmount.rules	2008-10-19 09:24:00 UTC (rev 42)
+++ usbmount/trunk/usbmount.rules	2008-10-19 12:27:16 UTC (rev 43)
@@ -1,6 +1,7 @@
-# Rules for USBmount
+# Rules for USBmount -*- conf -*-
 
-KERNEL=="sd*", BUS=="usb", ACTION=="add",    RUN+="/usr/share/usbmount/usbmount add"
-KERNEL=="ub*", BUS=="usb", ACTION=="add",    RUN+="/usr/share/usbmount/usbmount add"
-KERNEL=="sd*",             ACTION=="remove", RUN+="/usr/share/usbmount/usbmount remove"
-KERNEL=="ub*",             ACTION=="remove", RUN+="/usr/share/usbmount/usbmount remove"
+KERNEL=="sd*", DRIVERS=="sbp2",	ACTION=="add",	RUN+="/usr/share/usbmount/usbmount add"
+KERNEL=="sd*", BUS=="usb",	ACTION=="add",	RUN+="/usr/share/usbmount/usbmount add"
+KERNEL=="ub*", BUS=="usb",	ACTION=="add",	RUN+="/usr/share/usbmount/usbmount add"
+KERNEL=="sd*",			ACTION=="remove", RUN+="/usr/share/usbmount/usbmount remove"
+KERNEL=="ub*",			ACTION=="remove", RUN+="/usr/share/usbmount/usbmount remove"




More information about the Usbmount-commit mailing list