X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=doc%2Fgrml-autoconfig.current.txt;h=71ac363f8adfef06f10f9a717df48d3e993f3f73;hp=9c7e8feda33d49baea5bee01e4470a87e714ccd8;hb=79b3fa623f0f25e88a0bbdbea0bfa8de078f8f5d;hpb=e200e8e4b3e9104f147d5dc58d44a0749d687b71

diff --git a/doc/grml-autoconfig.current.txt b/doc/grml-autoconfig.current.txt
index 9c7e8fe..71ac363 100644
--- a/doc/grml-autoconfig.current.txt
+++ b/doc/grml-autoconfig.current.txt
@@ -1,7 +1,7 @@
 Behavior in current Grml versions
 ---------------------------------
 
-This section applies to all Grml versions newer than release 2009.05.
+This section applies to all Grml versions newer than release 2013.02.
 
 The central concept of grml-autoconfig is the DCS directory which holds debs,
 configuration and scripts which are used during system startup.
@@ -9,14 +9,17 @@ configuration and scripts which are used during system startup.
 Determination of DCS directory
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The DCS directory defaults to the root directory of the GRML live image. If a
-file system labeled GRMLCFG is found, the DCS directory is the root directory of
-that file system. Alternatively, the myconfig boot parameter can be used to
-directly specify a device which is then taken as DCS directory
-(myconfig=/dev/sda1, for example).
+The DCS directory defaults to the root directory of the GRML live image
+(Note: the directory is known as /lib/live/mount/medium/ on a _running_
+Grml system then!). If a file system labeled GRMLCFG is found, the DCS
+directory is the root directory of that file system. Alternatively, the
+myconfig boot parameter can be used to directly specify a device which
+is then taken as DCS directory (myconfig=/dev/sda1, for example). If
+your device is labeled different to GRMLCFG the proper label can be set
+via the autoconfig boot parameter (autoconfig=SOMELABEL, for example).
 
 Without any additional boot parameters, the GCA at DCSDIR/config.tbz is
-automatically unpacked and DCSDIR/scrips/grml.sh is automatically executed on
+automatically unpacked and DCSDIR/scripts/grml.sh is automatically executed on
 system startup. The 'noautoconfig' boot parameter disables this automatic
 behavior.
 
@@ -32,7 +35,14 @@ myconfig::
    device. Usage examples:
 
   myconfig=/dev/sda1                        => read DCS from usb-device
-  myconfig=/dev/fd0                         => read DCS from floppy-disk
+
+autoconfig::
+
+   This parameter specifies the label used to determine the DCS device.
+   If undefined the label GRMLCFG is used to find the DCS device.
+
+  autoconfig=SOMELABEL      => search for device labeled SOMELABEL to use as
+                               DCS device.
 
 home::
 
@@ -73,7 +83,7 @@ netscript::
     This can be used to detect if the script is executed via the netscript bootoption.
     Usage example:
 
-  netcript=server.tld/path/to/script       =>   download and run script/executable from server
+  netscript=server.tld/path/to/script      =>   download and run script/executable from server
   netscript=server.tld/script-$HOSTNAME    =>   download and run script/executable for specific host
 
 extract::
@@ -91,9 +101,7 @@ scripts::
     relative to DCSDIR. If the path points to a file, this single file is
     executed. If no path is given, it defaults to scripts/grml.sh.
     If the given name points to a directory, all scripts inside it are
-    executed, but the run-parts name restrictions apply: script names must
-    consist entirely of upper and lower case letters, digits, underscores,
-    and hyphens. Usage examples:
+    executed. Usage examples:
 
   scripts               =>   run script DCSDIR/scripts/grml.sh
   scripts=foobar.sh     =>   run script foobar.sh in DCSDIR
@@ -129,8 +137,8 @@ debnet::
 noautoconfig::
 
     Deactivate automounting. By default the scripts try to mount a device with
-    label 'GRMLCFG'. If you specify the noautoconfig bootparam this automounting
-    will be deactivated.
+    label 'GRMLCFG'. If you specify the noautoconfig boot parameter this
+    automounting will be deactivated.
 
   noautoconfig            => disables auto mounting of label 'GRMLCFG'
 
@@ -138,13 +146,14 @@ noautoconfig::
 Permanently adjust boot parameters
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-As you probably know you can adjust boot parameters on the bootprompt.  You want
-to set some boot parameters permanently? That's possible via adding a directory
-named 'bootparams' to the Grml ISO which has to be located at the root-directory
-/bootparams/ (note: the directory is known as /live/image/bootparams/ on a
-_running_ Grml system then). Place a textfile inside the directory containing
-the boot parameters which should be appended to default ones (this corresponds
-to booting without any special parameters).
+As you probably know you can adjust boot parameters on the bootprompt.
+You want to set some boot parameters permanently? That's possible via
+adding a directory named 'bootparams' to the Grml ISO which has to be
+located at the root-directory /bootparams/ (Note: the directory is known
+as /lib/live/mount/medium/bootparams/ on a _running_ Grml system then!).
+Place a textfile inside the directory containing the boot parameters
+which should be appended to default ones (this corresponds to booting
+without any special parameters).
 
   mkdir bootparams
   echo lang=de > bootparams/my_bootparams