* Don't ship /etc/auto.master and /etc/automount.sh anymore.

diff --git a/debian/changelog b/debian/changelog
index 843fb9d..03603c5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-etc (0.8-25) unstable; urgency=low
+
+  * Don't ship /etc/auto.master and /etc/automount.sh anymore.
+
+ -- Michael Prokop <mika@grml.org>  Wed, 18 Oct 2006 22:53:07 +0200
+
 grml-etc (0.8-24) unstable; urgency=low
 
   * Make sure we (un)divert /etc/skel/.zshrc only if diversion

diff --git a/etc/auto.master b/etc/auto.master
deleted file mode 100644 (file)
index 24ba23e..0000000
--- a/etc/auto.master
+++ /dev/null
@@ -1,10 +0,0 @@
-# Sample auto.master file
-# Format of this file:
-# mountpoint map options
-# For details of the format look at autofs(5).
-# /var/autofs/misc      /etc/auto.misc
-# /var/autofs/net       /etc/auto.net
-#
-# grml automounts for floppy and cdrom(s), see grml-autoconfig
-# /mnt/auto     /etc/auto.mnt   --timeout=2
-/mnt/auto       /etc/automount.sh       --timeout=2

diff --git a/etc/automount.sh b/etc/automount.sh
deleted file mode 100755 (executable)
index 44980c9..0000000
--- a/etc/automount.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-# Filename:      automount.sh
-# Purpose:       generate an automounter entry automatically for automount /mnt/auto program this_script
-# Authors:       (c) Klaus Knopper 2002, (c) Michael Prokop <mika@grml.org>
-# Bug-Reports:   see http://grml.org/bugs/
-# License:       This file is licensed under the GPL v2.
-# Latest change: Don Okt 28 16:19:40 CEST 2004 [mika]
-################################################################################
-
-# WARNING: This script is used for removable media in grml,
-# therefore the mount is always read-write (except for cdroms
-# and ntfs).
-
-# Defaults
-rw="rw"
-device="/dev/${1##*/}"
-case "$1" in
-floppy)     [ -s /etc/sysconfig/floppy ] || exit 1; device="/dev/fd0";;
-cdrom*)     rw="ro";;
-dvd*)       rw="ro";;
-esac
-
-# Uses external fstype script from grml-scanpartitions
-fs="$(fstype "$device")"
-
-[ "$?" = "0" ] || exit 1
-
-case "$fs" in
-*fat|msdos) options="${rw},uid=grml,gid=grml,umask=000";;
-ntfs)       options="ro,uid=grml,gid=grml,umask=0222";;
-iso9660)    options="ro";;
-*)          options="${rw}";;
-esac
-
-MNTLINE="-fstype=$fs,users,exec,$options       :$device"
-
-# Return line to the automounter
-echo "$MNTLINE"
-
-## END OF FILE #################################################################