! test -d "/media/$name" && mkdir -p "/media/$name"
- if ! $MOUNT -t auto -o dirsync,noatime,umask=0,gid=1000 $DEVNAME "/media/$name" && ! $MOUNT -t auto -o dirsync,noatime,umask=0,gid=1000 $DEVNAME "/media/$name"
+ if ! $MOUNT -t auto -o dirsync,noatime,umask=0 $DEVNAME "/media/$name" && ! $MOUNT -t auto -o dirsync,noatime,umask=0 $DEVNAME "/media/$name"
then
#logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!"
- rmdir "/media/$name"
+ rm_dir "/media/$name"
else
logger "mount.sh/automount" "Auto-mount of [/media/$name] successful"
touch "/tmp/.automount-$name3"
fstype=$(cat /etc/mtab | grep $DEVNAME | awk '{print $3}')
- echo "$DEVNAME 1000 0 $fstype dirsync,noatime,umask=0,gid=1000 /media/$name" >> /media/.hal-mtab
- chgrp wheel /media/.hal-mtab
+ echo "$DEVNAME 1000 0 $fstype dirsync,noatime,umask=0 /media/$name" >> /media/.hal-mtab
touch /media/.hal-mtab-lock
fi
}