Output to "./grml" in current working directory instead of /grml/grml-live

this would create problems as / is often space restricted

Closes #31 @ GH

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 2c7feb3..05e9177 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -254,7 +254,7 @@ Use ZLIB instead of LZMA/XZ compression in mksquashfs part of the build process.
 Usage examples
 --------------
 
 Usage examples
 --------------
 

-To get a Debian-stable and Grml-based Live-CD using /grml/grml-live
+To get a Debian-stable and Grml-based Live-CD using ./grml

 as build and output directory just run:
 
   # grml-live
 as build and output directory just run:
 
   # grml-live


@@ -560,7 +560,7 @@ Instructions
   # SQUASHFS_BINARY='/usr/bin/mksquashfs'
   ## install local files into the chroot
   # CHROOT_INSTALL="/etc/grml/fai/chroot_install"
   # SQUASHFS_BINARY='/usr/bin/mksquashfs'
   ## install local files into the chroot
   # CHROOT_INSTALL="/etc/grml/fai/chroot_install"

-  ## adjust if necessary (defaults to /grml/grml-live):
+  ## adjust if necessary (defaults to ./grml/):

   ## OUTPUT="/srv/grml-live"
   FAI_DEBOOTSTRAP="jessie http://ftp.debian.org/debian/"
   # ARCH="amd64"
   ## OUTPUT="/srv/grml-live"
   FAI_DEBOOTSTRAP="jessie http://ftp.debian.org/debian/"
   # ARCH="amd64"

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 78477f8..e30d4b7 100644 (file)
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -13,7 +13,7 @@
 
 # Main output directory
 # Please notice that you need suid,dev,rw permissions there
 
 # Main output directory
 # Please notice that you need suid,dev,rw permissions there

-# OUTPUT="/grml/grml-live"
+# OUTPUT="./grml/"

 # You have enough RAM? Use shared memory for fast testing-purposes:
 # OUTPUT="/dev/shm" # mount -o remount,suid,dev,rw /dev/shm
 
 # You have enough RAM? Use shared memory for fast testing-purposes:
 # OUTPUT="/dev/shm" # mount -o remount,suid,dev,rw /dev/shm
 

diff --git a/grml-live b/grml-live
index 044140a..0032121 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -402,7 +402,7 @@ fi
 [ -n "$VERSION" ]                 || VERSION='0.0.1'
 
 # output specific stuff, depends on $OUTPUT (iff not set):
 [ -n "$VERSION" ]                 || VERSION='0.0.1'
 
 # output specific stuff, depends on $OUTPUT (iff not set):

-[ -n "$OUTPUT" ]           || OUTPUT='/grml/grml-live'
+[ -n "$OUTPUT" ]           || OUTPUT='./grml/'

 [ -n "$BUILD_OUTPUT" ]     || BUILD_OUTPUT="$OUTPUT/grml_cd"
 [ -n "$CHROOT_OUTPUT" ]    || CHROOT_OUTPUT="$OUTPUT/grml_chroot"
 [ -n "$ISO_OUTPUT" ]       || ISO_OUTPUT="$OUTPUT/grml_isos"
 [ -n "$BUILD_OUTPUT" ]     || BUILD_OUTPUT="$OUTPUT/grml_cd"
 [ -n "$CHROOT_OUTPUT" ]    || CHROOT_OUTPUT="$OUTPUT/grml_chroot"
 [ -n "$ISO_OUTPUT" ]       || ISO_OUTPUT="$OUTPUT/grml_isos"