TMP=$(mktemp 2>/dev/null)
TMPFILE=$(mktemp 2>/dev/null)
ADDEDBYGRML="# Added by GRML"
-MNTFILE="/mnt/.grml-auto-created_do-not-delete-this-file"
-MOUNTPOINT_PREFIX=/mnt/
+MOUNTPOINT_PREFIX=/mnt
+MNTFILE="$MOUNTPOINT_PREFIX/.grml-auto-created_do-not-delete-this-file"
logit() {
fi
-if grep -q ' /mnt ' /proc/mounts ; then
- logit '/mnt is a mounted directory, exiting.'
+if grep -q ' $MOUNTPOINT_PREFIX ' /proc/mounts ; then
+ logit '$MOUNTPOINT_PREFIX is a mounted directory, exiting.'
bailout 1
fi
+# default directories {{{
+if [ -d "$MOUNTPOINT_PREFIX" ] ; then
+ [ -d "$MOUNTPOINT_PREFIX/floppy" ] || mkdir "$MOUNTPOINT_PREFIX/floppy"
+ [ -d "$MOUNTPOINT_PREFIX/cdrom" ] || mkdir "$MOUNTPOINT_PREFIX/cdrom"
+ [ -d "$MOUNTPOINT_PREFIX/test" ] || mkdir "$MOUNTPOINT_PREFIX/test"
+fi
+# }}}
+
# make sure we have the $MNTFILE before reading/writing into it
if [ -z "$NO_AUTO_FILE" ] ; then
[ -r $MNTFILE ] || touch $MNTFILE
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/fd0 /mnt/floppy auto user,noauto,exec 0 0
-/dev/external /mnt/external auto user,noauto,exec,rw,uid=grml,gid=grml 0 0
-/dev/external1 /mnt/external1 auto user,noauto,exec,rw,uid=grml,gid=grml 0 0
-/dev/cdrom /mnt/cdrom auto user,noauto,exec,ro 0 0
-/dev/dvd /mnt/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/hda1 /Grml ext3 dev,suid,user,noauto 0 2
+# /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
device="$1"
mountpoint="${device##*/}"
mountpoint="${mountpoint#*=}"
- echo /mnt/$mountpoint
+ echo "$MOUNTPOINT_PREFIX/$mountpoint"
}
append_fstab() {