Update /etc/grml/fai/config/scripts/GRML_X/* and docs according as well

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 0bfcead..1274ac0 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -184,6 +184,12 @@ configuration.
 
 Scripts for customising the ISO within build process.
 
+  /etc/grml/fai/files/
+
+This directory provides files used inside the scripts of
+/etc/grml/fai/config/scripts/*. For a full documentation what happens with the
+files please refer to the source of the scripts.
+
   /etc/grml/fai/live-initramfs/
 
 This directory provides the files used for building the initramfs/initrd via
@@ -215,7 +221,7 @@ that are arch specific so we have a clean package list in all classes)
 
 * support different grml-flavours through classes right out-of-the-box (being:
 grml, grml64, grml-small for at least x86, amd64 and ppc) [currently it defaults
-to Debian/stable I386]
+to Debian/stable I386, unstable I386 works as well]
 
 * support setting grml-live configuration on the command line to provide
 different flavours using the commandline only
@@ -241,9 +247,6 @@ not as verbose unless you specify it, make it configurable)
 
 * support nocolor-option for /etc/grml/fai/grml/grml_cleanup_chroot
 
-* copy files from $FAI_CONFIGDIR/... instead of using 'cat > $FILE << EOF ...'
-inside all the /etc/grml/fai/config/scripts/GRML/-scripts
-
 * provide autostart-stuff (for Windows) inside root of $BUILD_TARGET (the
 grml-cd)
 

diff --git a/etc/grml/fai/config/scripts/GRML_X/32-xorg b/etc/grml/fai/config/scripts/GRML_X/32-xorg
index 22227fa..bc89808 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML_X/32-xorg
+++ b/etc/grml/fai/config/scripts/GRML_X/32-xorg
@@ -1,7 +1,18 @@
 #!/bin/sh
+# Filename:      /etc/grml/fai/config/scripts/GRML_X/32-xorg
+# Purpose:       make sure there does not exist /etc/X11/xorg.conf by default
+# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
+# Bug-Reports:   see http://grml.org/bugs/
+# License:       This file is licensed under the GPL v2 or any later version.
+# Latest change: Sun Sep 16 23:17:08 CEST 2007 [mika]
+################################################################################
+
 set -u
 set -e
 
 if [ -r "$target/etc/X11/xorg.conf" ] ; then
    mv -f "$target"/etc/X11/xorg.conf "$target"/etc/X11/xorg.conf.debian
 fi
+
+## END OF FILE #################################################################
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3

diff --git a/etc/grml/fai/config/scripts/GRML_X/90-update-alternatives b/etc/grml/fai/config/scripts/GRML_X/90-update-alternatives
index 242e619..33ac271 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML_X/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRML_X/90-update-alternatives
@@ -1,4 +1,12 @@
 #!/bin/sh
+# Filename:      /etc/grml/fai/config/scripts/GRML_X/90-update-alternatives
+# Purpose:       set up /etc/alternatives/* according to grml preferences
+# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
+# Bug-Reports:   see http://grml.org/bugs/
+# License:       This file is licensed under the GPL v2 or any later version.
+# Latest change: Sun Sep 16 23:18:02 CEST 2007 [mika]
+################################################################################
+
 set -u
 set -e
 
@@ -9,3 +17,6 @@ fi
 if [ -r $target/etc/X11/cursors/whiteglass.theme ] ; then
    $ROOTCMD update-alternatives --set x-cursor-theme /etc/X11/cursors/whiteglass.theme
 fi
+
+## END OF FILE #################################################################
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3