projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
45395e8
)
Use a default TEMPLATE_DIRECTORY
author
Michael Prokop
<devnull@localhost>
Sat, 6 Oct 2007 16:38:41 +0000
(18:38 +0200)
committer
Michael Prokop
<devnull@localhost>
Sat, 6 Oct 2007 16:38:41 +0000
(18:38 +0200)
grml-live
patch
|
blob
|
history
diff --git
a/grml-live
b/grml-live
index
a9eebae
..
0ad0e75
100755
(executable)
--- 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 "$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
[ -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/
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
if ! [ -d "${TEMPLATE_DIRECTORY}"/boot ] ; then
log "${TEMPLATE_DIRECTORY}/boot does not exist. Exiting."
eerror "${TEMPLATE_DIRECTORY}/boot does not exist. Exiting." ; eend 1