From: Michael Prokop Date: Wed, 11 Jan 2012 12:38:33 +0000 (+0100) Subject: Use /media instead of /mnt for default mount paths [Testing: issue1127] X-Git-Tag: v0.2.0~1 X-Git-Url: https://git.grml.org/?a=commitdiff_plain;ds=sidebyside;h=e403a713b7b60da04e46e9063deda71859399854;p=grml-udev-config.git Use /media instead of /mnt for default mount paths [Testing: issue1127] --- diff --git a/debian/README.Debian b/debian/README.Debian index 8f53b7b..866164d 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -30,7 +30,7 @@ forensic/readonly. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This script triggers the /usr/sbin/rebuildfstab script for updating /etc/fstab -and /mnt/* when block devices are added or removed from the system. +and /media/* when block devices are added or removed from the system. /lib/udev/rules.d/60-grml-external.rules ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -47,9 +47,9 @@ compatibility reasons. This udev rule allows simple access to USB devices like pendrives upon plugging them in. You'll get according symlinks in /dev (prefixed with 'usb-'), entries -in /etc/fstab (via rebuildfstab) and directories in /mnt according to available +in /etc/fstab (via rebuildfstab) and directories in /media according to available labeled filesystems for free. On removal of the USB device the symlinks and -usb*-directories in /mnt will automatically vanish. +usb*-directories in /media will automatically vanish. -- Michael Prokop Fri, 13 Nov 2009 12:02:41 +0100 diff --git a/debian/grml-udev-config.grml-usbdev.udev b/debian/grml-udev-config.grml-usbdev.udev index 00923b0..823e105 100644 --- a/debian/grml-udev-config.grml-usbdev.udev +++ b/debian/grml-udev-config.grml-usbdev.udev @@ -1,2 +1,2 @@ -# Create device link for /mnt/usb-sd* stuff +# Create device link for /media/usb-sd* stuff ACTION=="add", KERNEL=="sd[a-z]*", SUBSYSTEM=="block", SUBSYSTEMS=="usb", SYMLINK+="usb-%k", GROUP="users" diff --git a/debian/grml-udev-rebuildfstab.8 b/debian/grml-udev-rebuildfstab.8 index 8ce54a1..7207b7b 100644 --- a/debian/grml-udev-rebuildfstab.8 +++ b/debian/grml-udev-rebuildfstab.8 @@ -17,7 +17,7 @@ devices below any lines containing "Added by GRML" but instead \fBabove\fP the line \'"Warning! Please do....\'". If a partition contains a filesystem with a filesystem label on it, an entry -with LABEL= is generated so you can run \'mount /mnt/$LABEL\'. If multiple +with LABEL= is generated so you can run \'mount /media/$LABEL\'. If multiple filesystems have the same filesystem, label entries with UUID= are generated instead so uniqueness for mounting filesystems can be guaranteed. If duplicate labels are present but UUIDs are not set it is falling back to normal diff --git a/scripts/grml-udev-rebuildfstab b/scripts/grml-udev-rebuildfstab index 9aaf08f..a94f4f4 100755 --- a/scripts/grml-udev-rebuildfstab +++ b/scripts/grml-udev-rebuildfstab @@ -10,7 +10,7 @@ PATH="/bin:/sbin:/usr/bin:/usr/sbin" TMP=$(mktemp 2>/dev/null) TMPFILE=$(mktemp 2>/dev/null) ADDEDBYGRML="# Added by GRML" -MOUNTPOINT_PREFIX=/mnt +MOUNTPOINT_PREFIX=/media MNTFILE="$MOUNTPOINT_PREFIX/.grml-auto-created_do-not-delete-this-file" @@ -92,17 +92,17 @@ proc /proc proc rw,nosuid,nodev,noexec 0 none /proc/bus/usb usbfs defaults,noauto 0 0 sysfs /sys sysfs rw,nosuid,nodev,noexec 0 0 devpts /dev/pts devpts noauto,mode=0622 0 0 -/dev/external $MOUNTPOINT_PREFIX/external auto user,noauto,exec,rw,uid=grml,gid=grml 0 0 -/dev/external1 $MOUNTPOINT_PREFIX/external1 auto user,noauto,exec,rw,uid=grml,gid=grml 0 0 -/dev/cdrom $MOUNTPOINT_PREFIX/cdrom auto user,noauto,exec,ro 0 0 -/dev/dvd $MOUNTPOINT_PREFIX/dvd auto user,noauto,exec,ro 0 0 +/dev/external ${MOUNTPOINT_PREFIX}/external auto user,noauto,exec,rw,uid=grml,gid=grml 0 0 +/dev/external1 ${MOUNTPOINT_PREFIX}/external1 auto user,noauto,exec,rw,uid=grml,gid=grml 0 0 +/dev/cdrom ${MOUNTPOINT_PREFIX}/cdrom auto user,noauto,exec,ro 0 0 +/dev/dvd ${MOUNTPOINT_PREFIX}/dvd auto user,noauto,exec,ro 0 0 # some other examples: # /dev/sda1 /Grml ext3 dev,suid,user,noauto 0 2 # //1.2.3.4/pub /smb/pub smbfs defaults,user,noauto,uid=grml,gid=grml 0 0 # linux:/pub /beer nfs defaults 0 0 # tmpfs /tmp tmpfs size=300M 0 0 # none /proc/bus/usb usbfs defaults,nodev,noexec,nosuid,noauto,devgid=1001,devmode=664 0 0 -# 192.168.1.101:/backups /mnt/nfs nfs defaults,user,wsize=8192,rsize=8192 0 0 +# 192.168.1.101:/backups ${MOUNTPOINT_PREFIX}/nfs nfs defaults,user,wsize=8192,rsize=8192 0 0 # # Warning! Please do *not* change any lines below because they are auto-generated. # If you want to disable rebuildfstab set CONFIG_FSTAB='no' in /etc/grml/autoconfig! @@ -272,7 +272,7 @@ add|change) ;; esac -# Clean /mnt/... according to info $MNTFILE +# Clean $MOUNTPOINT_PREFIX according to info $MNTFILE if [ -r "$MNTFILE" ] ; then for directory in $(cat $MNTFILE) ; do rmdir $directory 2>/dev/null && sed -i "s#$directory##" $MNTFILE @@ -281,7 +281,7 @@ if [ -r "$MNTFILE" ] ; then cat $TMPFILE > $MNTFILE fi -# Make sure we have all /mnt/* directories +# Make sure we have all directories in $MOUNTPOINT_PREFIX while read p m f relax; do case "$m" in *none*|*proc*|*sys*|'') continue ;; esac if ! grep -q "$m" /proc/mounts ; then