[SCM] debian-live/config-webc branch, master, updated. ea18dff8af2b6800c580b70ce4219aacae9dae73

[Kai Hendry]

The following commit has been merged in the master branch:
commit ea18dff8af2b6800c580b70ce4219aacae9dae73
Author: Kai Hendry <hendry at iki.fi>
Date:   Mon Jan 16 04:22:38 2012 +0100

    https://groups.google.com/forum/#!msg/webc-users/J4KOYFrv0Do/jZaGCs8_AOIJ

diff --git a/webconverger/config/includes.chroot/etc/udev/rules.d/11-media-by-label-auto-mount.rules b/webconverger/config/includes.chroot/etc/udev/rules.d/11-media-by-label-auto-mount.rules
deleted file mode 100644
index 2b6d30d..0000000
--- a/webconverger/config/includes.chroot/etc/udev/rules.d/11-media-by-label-auto-mount.rules
+++ /dev/null
@@ -1,23 +0,0 @@
-ENV{mount_options}="relatime"
-KERNEL!="sd[a-z][0-9]", 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}="usbhd-%k"
-
-# Global mount options
-ACTION=="add", ENV{mount_options}="relatime"
-# 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/webconverger/config/includes.chroot/etc/udev/rules.d/11-sd-cards-auto-mount.rules b/webconverger/config/includes.chroot/etc/udev/rules.d/11-sd-cards-auto-mount.rules
deleted file mode 100644
index 61dc69b..0000000
--- a/webconverger/config/includes.chroot/etc/udev/rules.d/11-sd-cards-auto-mount.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-KERNEL!="mmcblk[0-9]p[0-9]", 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"

-- 
debian-live/config-webc