diff --git a/alarm/udev-automount/11-media-by-label-auto-mount.rules b/alarm/udev-automount/11-media-by-label-auto-mount.rules deleted file mode 100644 index bd8806f3f..000000000 --- a/alarm/udev-automount/11-media-by-label-auto-mount.rules +++ /dev/null @@ -1,23 +0,0 @@ -KERNEL!="sd[a-z][0-9]", GOTO="media_by_label_auto_mount_end" -PROGRAM="/usr/bin/grep -q ' %M:%m /[^ ]* /' /proc/self/mountinfo", PROGRAM!="/usr/bin/grep -q ' %M:%m / /media/' /proc/self/mountinfo", GOTO="media_by_label_auto_mount_end" - -# Import FS infos -IMPORT{program}="/sbin/blkid -o udev -p %N" - -# Get a label if present, otherwise specify one -ENV{ID_FS_LABEL}!="", ENV{dir_name}="%E{ID_FS_LABEL}" -ENV{ID_FS_LABEL}=="", ENV{dir_name}="hd-%k" - -# Global mount options -ACTION=="add", ENV{mount_options}="noatime" -# Filesystem-specific mount options -ACTION=="add", ENV{ID_FS_TYPE}=="vfat|ntfs", ENV{mount_options}="$env{mount_options},utf8,gid=100,umask=002" - -# Mount the device -ACTION=="add", RUN+="/bin/mkdir -p /media/%E{dir_name}", RUN+="/bin/mount -o $env{mount_options} /dev/%k /media/%E{dir_name}" - -# Clean up after removal -ACTION=="remove", ENV{dir_name}!="", RUN+="/bin/umount -l /media/%E{dir_name}", RUN+="/bin/rmdir /media/%E{dir_name}" - -# Exit -LABEL="media_by_label_auto_mount_end" diff --git a/alarm/udev-automount/11-sd-cards-auto-mount.rules b/alarm/udev-automount/11-sd-cards-auto-mount.rules deleted file mode 100644 index 6052f28ca..000000000 --- a/alarm/udev-automount/11-sd-cards-auto-mount.rules +++ /dev/null @@ -1,12 +0,0 @@ -KERNEL!="mmcblk[0-9]p[0-9]", GOTO="sd_cards_auto_mount_end" -PROGRAM="/usr/bin/grep -q ' %M:%m /[^ ]* /' /proc/self/mountinfo", PROGRAM!="/usr/bin/grep -q ' %M:%m / /media/' /proc/self/mountinfo", GOTO="sd_cards_auto_mount_end" - -# Global mount options -ACTION=="add", ENV{mount_options}="relatime" -# Filesystem specific options -ACTION=="add", IMPORT{program}="/sbin/blkid -o udev -p %N" -ACTION=="add", ENV{ID_FS_TYPE}=="vfat|ntfs", ENV{mount_options}="$env{mount_options},utf8,gid=100,umask=002" - -ACTION=="add", RUN+="/bin/mkdir -p /media/sd-%k", RUN+="/bin/ln -s /media/sd-%k /mnt/sd-%k", RUN+="/bin/mount -o $env{mount_options} /dev/%k /media/sd-%k" -ACTION=="remove", RUN+="/bin/umount -l /media/sd-%k", RUN+="/bin/rmdir /media/sd-%k" -LABEL="sd_cards_auto_mount_end" diff --git a/alarm/udev-automount/PKGBUILD b/alarm/udev-automount/PKGBUILD deleted file mode 100755 index 41a9ec8bf..000000000 --- a/alarm/udev-automount/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# ALARM Maintainer: Mike Staszel - -# This is an ALARM-exclusive package for easy USB/SD drive automounting - -pkgname=udev-automount -pkgver=1.0 -pkgrel=3 -pkgdesc="Automount rules for udev" -arch=('arm' 'armv7h') -url="http://archlinuxarm.org/" -license=('GPL') -groups=('base') -depends=('udev') -backup=('etc/udev/rules.d/11-media-by-label-auto-mount.rules' 'etc/udev/rules.d/11-sd-cards-auto-mount.rules') -source=(11-media-by-label-auto-mount.rules - 11-sd-cards-auto-mount.rules) -md5sums=('10f896103076818d6186c4fb91030f72' - '5af0e10d45f5f2e63c89eb2e5b43a553') - -build() { - echo "udev-automount" -} - -package() { - mkdir -p $pkgdir/etc/udev/rules.d - cp $srcdir/11-media-by-label-auto-mount.rules $pkgdir/etc/udev/rules.d/ - cp $srcdir/11-sd-cards-auto-mount.rules $pkgdir/etc/udev/rules.d/ -}