diff options
author | nachoparker <nacho@ownyourbits.com> | 2017-09-09 10:22:27 +0300 |
---|---|---|
committer | nachoparker <nacho@ownyourbits.com> | 2017-09-09 10:22:43 +0300 |
commit | 1f055f89332a7595da7a6ea3cc7c700a57b6a1c9 (patch) | |
tree | 0c6d47b85b3510d95221435be1e436706a2eb3e4 /etc | |
parent | b1c5fa66949620de7756db304aeb2a1f15656f40 (diff) |
nc-format-USB: adjust to the new automount systemv0.26.22
Diffstat (limited to 'etc')
-rw-r--r-- | etc/nextcloudpi-config.d/nc-format-USB.sh | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/etc/nextcloudpi-config.d/nc-format-USB.sh b/etc/nextcloudpi-config.d/nc-format-USB.sh index 7643a6b2..c1dc5dae 100644 --- a/etc/nextcloudpi-config.d/nc-format-USB.sh +++ b/etc/nextcloudpi-config.d/nc-format-USB.sh @@ -34,18 +34,11 @@ configure() } # umount if mounted - umount /dev/USBdrive* &> /dev/null + umount /media/USBdrive* &> /dev/null # check still not mounted - local DEVS=() - local LINKS=( $( ls /dev/USBdrive* 2>/dev/null ) ) - - for link in ${LINKS[@]}; do - DEVS+=( $( readlink $link ) ) - done - - for dev in ${DEVS[@]}; do - grep -q /dev/$dev /proc/mounts && { echo "/dev/$dev is still mounted"; return 1; } + for dir in $( ls -d /media/* 2>/dev/null ); do + mountpoint -q $dir && { echo "$dir is still mounted"; return 1; } done # do it @@ -55,11 +48,6 @@ configure() wipefs -a -f /dev/"$NAME" || return 1 printf 'o\nn\np\n1\n\n\nw\n' | sudo fdisk /dev/"$NAME" || return 1 mkfs.ext4 -F /dev/"${NAME}1" -L "$LABEL_" - - # trigger automount rules if active - test -f /etc/udev/rules.d/50-automount.rules || return 0 - udevadm trigger - mount /dev/USBdrive* } install() { :; } |