Update README.Debian + debian/rules

diff --git a/debian/README.Debian b/debian/README.Debian
index f78cae3..8f53b7b 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,62 +1,55 @@
 grml-udev-config for Debian
 ---------------------------
 
-grml.rules
-==========
-A custom rule file /etc/udev/z30_grml.rules is installed by the grml udev
-package.  This file contains a udev rule to map USB-Pendrives (or USB-Sticks) to
-the /dev/external* device nodes (or symlinks respectively). This allows us to
-easily mount USB-Sticks on a grml System and you don't risk to accidentialy
-overwrite your SCSI/S-ATA disk.
-Note: These rules are deprecated in favour of the grml_usbdev rules mentioned
-below. Nevertheless this way of accessing USB-Pendrives is retained for
-backwards compatibility reasons.
-
-grml_usbdev.rules
-=================
-The rule file /etc/udev/z31_grml_usbdev.rules is installed. The rules contained
-in there allow 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
-labeled filesystems for free. On removal of the usb device the symlinks and
-usb*-directories in /mnt will automatically vanish.
+Notes regarding installation
+============================
+
+Please notice that this package does NOT activate its init script itself on
+installation. The udev rules are enabled automatically but if you want to use
+the bootoptions noudev and blacklist you have to enable the provided init script
+manually (unless you are using just the Grml *live* system of course where the
+according toolchains do that for you).
+
+So if you want to enable the grml-udev initscript manually on your system
+execute the following commands to replace the /etc/init.d/udev script with
+/etc/init.d/grml-udev:
 
-To prevent udev from automatically creating the directories and fstab entries
-please rename the rules file by executing:
+ update-rc.d -f udev remove
+ update-rc.d grml-udev start 03 S .
 
-       mv z31_grml_usbdev.rules \#z31_grml_usbdev.rules
+Documentation of provided rules
+===============================
 
-inside the directory /etc/udev/rules.d
+/lib/udev/rules.d/01-grml-forensic.rules
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Persistent network interfaces
-=============================
-Don't run write_net_rules on any occasion, it's evil on a Live-CD. The script is
-still shipped and can be enabled manually to get persistent network interfaces
-across reboots (e.g. after a hd-install). Just execute
+Mark new block devices as readonly when booting with bootoption
+forensic/readonly.
 
-       mv \#75_persistent-net-generator.rules 75_persistent-net-generator.rules
+/lib/udev/rules.d/60-grml-blockdevices.rules
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-in /etc/udev/rules.d and reload the udev rules with 'udevcontrol reload_rules'
-(as root)
+This script triggers the /usr/sbin/rebuildfstab script for updating /etc/fstab
+and /mnt/* when block devices are added or removed from the system.
 
-Or better just see 'grml-tips udev' for other ways to get persistent network
-interfaces.
+/lib/udev/rules.d/60-grml-external.rules
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-SELinux support
-===============
-The udev version on grml is built without support for SELinux.
+Udev rule to map USB pendrives/sticks to /dev/external* device nodes (or
+symlinks respectively).
 
-Various
-=======
-The generation of the udeb package has been disabled in debian/rules (by
-removing BUILD_UDEB := 1) as this is not needed on grml. Some grml specific
-functions have been added to the init script and to the maintainer scripts.
+Note: This rule is deprecated in favour of the grml-usbdev rules file mentioned
+below. Nevertheless this way of accessing devices is retained for backwards
+compatibility reasons.
 
-hg repository
-==============
-Since version 0.103-0grml1 this package is maintained in the grml hg repository
-at http://hg.grml.org/udev. The version in the git repository at
-http://git.distanz.ch is not maintained anymore.
+/lib/udev/rules.d/60-grml-usbdev.rules
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+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
+labeled filesystems for free. On removal of the USB device the symlinks and
+usb*-directories in /mnt will automatically vanish.
 
  -- Michael Prokop <mika@grml.org>  Fri, 13 Nov 2009 12:02:41 +0100
 

diff --git a/debian/rules b/debian/rules
index a526d1f..6333ca4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 build: build-stamp
@@ -45,7 +39,8 @@ binary-indep: install
        dh_installudev --name=grml-usbdev       --priority 60
        dh_installudev --name=grml-blockdevices --priority 60
        dh_installinit --no-start --name=grml-udev
-       # --update-rcd-params='start 2 S .'
+       # do *NOT* automatically install it, see README.Debian
+       # --update-rcd-params='start 03 S .'
        dh_installman
        dh_link
        dh_strip