Revert USB automounting setup

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3321b20a1aa70cf134012feb3e33df1e45923b1b..3028df7071738f5456f28215d35b444897eeeb1f 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,6 @@ Buildbotics CNC Controller Firmware Changelog
 =============================================
 
 ## v0.4.14
- - Allow user to unmount/eject USB stick on local head.
 
 ## v0.4.13
  - Support for OMRON MX2 VFD.

diff --git a/scripts/11-automount.rules b/scripts/11-automount.rules
index 0f5d698ce81a3c304a750080ce28cf84b6b9aa3c..96967d4551afcfbb87aaec296f8c6ad93b4f89a7 100644 (file)
--- a/scripts/11-automount.rules
+++ b/scripts/11-automount.rules
@@ -1,9 +1,10 @@
-KERNEL!="sd[abc]|sd[abc][123]", GOTO="automount_end"
+KERNEL!="sd[a-z]*", GOTO="automount_end"
 IMPORT{program}="/sbin/blkid -o udev -p %N"
 ENV{ID_FS_TYPE}=="", GOTO="automount_end"
-ENV{dir_name}="USB_DRIVE-%k"
-ACTION=="add", RUN+="/bin/mkdir -p /media/%E{dir_name}", \
-               RUN+="/bin/mount /dev/%k"
-ACTION=="remove", RUN+="/bin/umount -l /dev/%k", \
-                  RUN+="/bin/rmdir /media/%E{dir_name}"
+ENV{ID_FS_LABEL}!="", ENV{dir_name}="%E{ID_FS_LABEL}"
+ENV{ID_FS_LABEL}=="", ENV{dir_name}="usb-%k"
+ACTION=="add", ENV{mount_options}="relatime"
+ACTION=="add", ENV{ID_FS_TYPE}=="vfat|ntfs", ENV{mount_options}="$env{mount_options},utf8,gid=100,umask=002,sync"
+ACTION=="add", RUN+="/bin/mkdir -p /media/%E{dir_name}", RUN+="/bin/mount -o $env{mount_options} /dev/%k /media/%E{dir_name}"
+ACTION=="remove", ENV{dir_name}!="", RUN+="/bin/umount -l /media/%E{dir_name}", RUN+="/bin/rmdir /media/%E{dir_name}"
 LABEL="automount_end"

diff --git a/scripts/install.sh b/scripts/install.sh
index 03f811eec75ea9a043289c3ffe928ef64bb571e1..af1b37055bbb6eec68c1908951dc9940f5266ff6 100755 (executable)
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -77,19 +77,6 @@ if [ $? -ne 0 ]; then
   REBOOT=true
 fi
 
-for letter in a b c; do
-  for number in '' 1 2 3; do
-    DEV=sd$letter$number
-    MOUNT=/media/USB_DRIVE-$DEV
-    OPTIONS=defaults,utf8,gid=100,umask=002,sync,noauto,flush,users
-
-    grep "/dev/$DEV[[:space:]]" /etc/fstab >/dev/null
-    if [ $? -ne 0 ]; then
-      echo "/dev/$DEV $MOUNT auto $OPTIONS 0 0" >> /etc/fstab
-    fi
-  done
-done
-
 # Increase swap
 grep 'CONF_SWAPSIZE=1000' /etc/dphys-swapfile >/dev/null
 if [ $? -ne 0 ]; then