Replace /dev/shm with /grml/grml-live as default target

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 21a5f4f..9f637c3 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -57,8 +57,11 @@ Specify the Debian suite you want to use for your live-system.  Defaults to
 
   -t **TARGET_DIRECTORY**::
 
-Output directory of the build process of FAI - being the chroot
-used for building the ISO.
+Main output directory of the build process of FAI.  Three directories are
+created inside the target directory, being: grml_cd/ - where the files for
+creating the ISO are located (including the compressed squashfs file),
+grml_chroot/ - the generated chroot system and grml_isos/ - where the resulting
+ISO is stored.
 
   -F::
 
@@ -76,15 +79,15 @@ Increase verbosity in the build process.
 How to get your own live-cd - the easy, fast and simple way
 -----------------------------------------------------------
 
-To get a small, Debian-stable and grml based live-cd using /dev/shm/
+To get a small, Debian-stable and grml based live-cd using /grml/grml-live
 as build and output directory:
 
   # grml-live
 
-To get a small Debian-unstable and grml-small based live-cd using /grml as build
-and output directory:
+To get a small Debian-unstable and grml-small based live-cd using
+/home/mika/grml-live as build and output directory:
 
-  # grml-live -c GRMLBASE,GRML_SMALL,I386 -t /grml
+  # grml-live -c GRMLBASE,GRML_SMALL,I386 -t /home/mika/grml-live
 
 [NOTE]
 
@@ -247,9 +250,6 @@ Known TODOs
 * make sure the suite-target adjusts the mirror definitions according (working
 also vice versa!)
 
-* do not use /dev/shm/ als default target directory (which one do we want to use
-instead?)
-
 * add support for amd64 [gebi?] + ppc [formorer?] (and identify all packages
 that are arch specific so we have a clean package list in all classes)
 

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index dd8ab26..a71391b 100644 (file)
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -3,13 +3,13 @@
 # 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:54:07 CEST 2007 [mika]
+# Latest change: Tue Sep 18 09:31:39 CEST 2007 [mika]
 ################################################################################
 
 # main output directory
 # please notice that you need suid,dev,rw permissions there
-TARGET="/dev/shm" # FIXME / TODO
-# mount -o remount,suid,dev,rw /dev/shm
+TARGET="/grml/grml-live"
+# TARGET="/dev/shm" # mount -o remount,suid,dev,rw /dev/shm
 
 # chroot of the buildprocess files:
 CHROOT_TARGET="$TARGET/grml_chroot"

diff --git a/grml-live b/grml-live
index 53e19c8..832d44b 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -61,8 +61,8 @@ Usage: $PN [-c <classe[s]>] [-t <target_directory>] [-s <suite> [-Fvh]
 Usage examples:
 
     $PN
-    $PN -c GRMLBASE,I386 -t /dev/shm/grml
     $PN -c GRMLBASE,GRML_X,I386 -t /grml/
+    $PN -c GRMLBASE,I386 -t /dev/shm/grml
     $PN -c GRMLBASE,GRML_SMALL,I386
     $PN -s sid -c GRMLBASE,I386