X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=0ad0e754f451ba6fdbf81b78ad0537a416bd059e;hb=9954603848466fe877026c2b574651eddc03a43d;hp=e5d432b663827edec35fd9c2d20ed11eb67ac3e2;hpb=41956296400b629eb06aba866358d5f8c60993af;p=grml-live.git

diff --git a/grml-live b/grml-live
index e5d432b..0ad0e75 100755
--- a/grml-live
+++ b/grml-live
@@ -198,6 +198,7 @@ if [ -z "$FORCE" ] ; then
    [ -n "$VERSION" ]       && echo "  grml version:      $VERSION"
    [ -n "$SUITE" ]         && echo "  Debian suite:      $SUITE"
    [ -n "$BOOT_METHOD" ]   && echo "  Boot method:       $BOOT_METHOD"
+   [ -n "$TEMPLATE_DIRECTORY" ] && echo "  Template files:    $TEMPLATE_DIRECTORY"
    [ -n "$FAI_ARGS" ]      && echo "  additional arguments for FAI: $FAI_ARGS"
    [ -n "$VERBOSE" ]       && echo "  Using VERBOSE mode."
    echo
@@ -305,8 +306,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
       # if we don't have an initrd we a) can't boot and b) there was an error
       # during build, so check for the file:
       if [ -f "$CHROOT_OUTPUT"/boot/initrd* ] ; then
-         # do not keep the initrd inside the chroot, let's save space instead:
-         mv "$CHROOT_OUTPUT"/boot/initrd*                     "$BUILD_OUTPUT"/boot/isolinux/initrd.gz
+         cp "$CHROOT_OUTPUT"/boot/initrd*  "$BUILD_OUTPUT"/boot/isolinux/initrd.gz
       else
          log "No initrd found inside $CHROOT_OUTPUT/boot/ - Exiting"
          eerror "No initrd found inside $CHROOT_OUTPUT/boot/ - Exiting" ; eend 1
@@ -319,6 +319,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
       cp /usr/lib/syslinux/memdisk                         "$BUILD_OUTPUT"/boot/isolinux/
       cp /usr/lib/syslinux/menu.c32                        "$BUILD_OUTPUT"/boot/isolinux/
 
+      [ -n "$TEMPLATE_DIRECTORY" ] || TEMPLATE_DIRECTORY='/usr/share/grml-live/templates'
       if ! [ -d "${TEMPLATE_DIRECTORY}"/boot ] ; then
          log "${TEMPLATE_DIRECTORY}/boot does not exist. Exiting."
          eerror "${TEMPLATE_DIRECTORY}/boot does not exist. Exiting." ; eend 1