package/usbmount/usbmount-0.0.14.1.patch

   1 diff -ur usbmount-0.0.14.1/usbmount usbmount-0.0.14.1-patched/usbmount
   2 --- usbmount-0.0.14.1/usbmount  2007-01-27 05:22:14.000000000 -0600
   3 +++ usbmount-0.0.14.1-patched/usbmount  2007-03-15 07:25:18.000000000 -0500
   4 @@ -20,7 +20,7 @@
   5  log()
   6  {
   7      if test $1 != debug || expr "$VERBOSE" : "[yY]" > /dev/null; then
   8 -       logger -p user.$1 -t "usbmount[$$]" -- "$2"
   9 +       echo "usbmount[$$] -- $2" >> $LOGFILE
  10      fi
  11  }
  12
  13 @@ -57,11 +57,11 @@
  14  if test "$1" = add; then
  15
  16      # Acquire lock.
  17 -    log debug "trying to acquire lock /var/run/usbmount/.mount.lock"
  18 -    lockfile-create --retry 3 /var/run/usbmount/.mount || \
  19 -       { log err "cannot acquire lock /var/run/usbmount/.mount.lock"; exit 1; }
  20 -    trap '( lockfile-remove /var/run/usbmount/.mount )' 0
  21 -    log debug "acquired lock /var/run/usbmount/.mount.lock"
  22 +    log debug "trying to acquire lock /var/run/.usbmount.lock"
  23 +    lockfile-create --retry 5 /var/run/.usbmount || \
  24 +       { log err "cannot acquire lock /var/run/.usbmount.lock"; exit 1; }
  25 +    trap '( lockfile-remove /var/run/.usbmount )' 0
  26 +    log debug "acquired lock /var/run/.usbmount.lock"
  27
  28      # Try to read from the device.  Some devices need a few seconds
  29      # initialization time before they can be accessed.  Give up after
  30 @@ -184,6 +184,7 @@
  31                 log info "executing command: run-parts /etc/usbmount/umount.d"
  32                 run-parts /etc/usbmount/umount.d || :
  33             fi
  34 +           lockfile-remove /var/run/.usbmount
  35             break
  36         fi
  37      done < /proc/mounts
  38 diff -ur usbmount-0.0.14.1/usbmount.conf usbmount-0.0.14.1-patched/usbmount.conf
  39 --- usbmount-0.0.14.1/usbmount.conf     2005-04-08 09:05:10.000000000 -0500
  40 +++ usbmount-0.0.14.1-patched/usbmount.conf     2007-03-15 07:21:33.000000000 -0500
  41 @@ -17,7 +17,7 @@
  42  # sure all data is written to the medium before you remove it (e.g. run the #
  43  # "sync" command in a terminal window).  Otherwise, you *WILL* lose data!   #
  44  #############################################################################
  45 -FILESYSTEMS="ext2 ext3"
  46 +FILESYSTEMS="ext2 ext3 msdos vfat"
  47
  48  # Mount options: Options passed to the mount command with the -o flag.
  49  # WARNING!  Removing "sync" from the options is a very bad idea and
  50 @@ -35,3 +35,7 @@
  51  # If set to "yes", more information will be logged via the syslog
  52  # facility.
  53  VERBOSE="no"
  54 +
  55 +# Location of the log file when verbose is Yes
  56 +LOGFILE="/var/log/usbmount.log"
  57 +