X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=0ad0e754f451ba6fdbf81b78ad0537a416bd059e;hp=a9eebae7ce48e68037aa7949d7f925ed5692a4e8;hb=9954603848466fe877026c2b574651eddc03a43d;hpb=45395e8d6915565e655bd4db6d63ea30945bdc1b diff --git a/grml-live b/grml-live index a9eebae..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 @@ -318,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