usbmount-0.0.14.1.patch 2.3 KB

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