projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
102276a
)
Move MKISOFS handling to appropriate code path
author
Michael Prokop
<mika@grml.org>
Tue, 4 Aug 2009 19:35:23 +0000
(21:35 +0200)
committer
Michael Prokop
<mika@grml.org>
Tue, 4 Aug 2009 19:35:23 +0000
(21:35 +0200)
grml-live
patch
|
blob
|
history
diff --git
a/grml-live
b/grml-live
index
42157e8
..
7ba5138
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-781,6
+781,10
@@
elif [ "$BOOT_METHOD" = "grub" ] ; then
fi
if [ -f "${ISO_OUTPUT}/${ISO_NAME}" -a -z "$UPDATE" -a -z "$BUILD_ONLY" -a -z "$BUILD_DIRTY" ] ; then
fi
if [ -f "${ISO_OUTPUT}/${ISO_NAME}" -a -z "$UPDATE" -a -z "$BUILD_ONLY" -a -z "$BUILD_DIRTY" ] ; then
+ log "$ISO_OUTPUT exists already, skipping stage 'iso build'"
+ ewarn "$ISO_OUTPUT exists already, skipping stage 'iso build'" ; eend 0
+else
+ mkdir -p "$ISO_OUTPUT" || bailout 6 "Problem with creating $ISO_OUTPUT for stage 'iso build'"
# support mkisofs as well as genisoimage
if which mkisofs >/dev/null 2>&1; then
# support mkisofs as well as genisoimage
if which mkisofs >/dev/null 2>&1; then
@@
-793,11
+797,6
@@
if [ -f "${ISO_OUTPUT}/${ISO_NAME}" -a -z "$UPDATE" -a -z "$BUILD_ONLY" -a -z "$
bailout
fi
bailout
fi
- log "$ISO_OUTPUT exists already, skipping stage 'iso build'"
- ewarn "$ISO_OUTPUT exists already, skipping stage 'iso build'" ; eend 0
-else
- mkdir -p "$ISO_OUTPUT" || bailout 6 "Problem with creating $ISO_OUTPUT for stage 'iso build'"
-
CURRENT_DIR=$(pwd)
if cd "$BUILD_OUTPUT" ; then
log "$MKISOFS -V '${GRML_NAME} ${VERSION}' -publisher 'grml-live | grml.org' -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table -b $BOOT_FILE -o ${ISO_OUTPUT}/${ISO_NAME} ."
CURRENT_DIR=$(pwd)
if cd "$BUILD_OUTPUT" ; then
log "$MKISOFS -V '${GRML_NAME} ${VERSION}' -publisher 'grml-live | grml.org' -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table -b $BOOT_FILE -o ${ISO_OUTPUT}/${ISO_NAME} ."