projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small update inside check for configuration stuff
[grml-live.git]
/
grml-live
diff --git
a/grml-live
b/grml-live
index
16d4a6f
..
53e19c8
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-4,7
+4,7
@@
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2 or any later version.
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2 or any later version.
-# Latest change:
Mon Sep 17 00:21:49
CEST 2007 [mika]
+# Latest change:
Tue Sep 18 09:11:50
CEST 2007 [mika]
################################################################################
# read configuration files, set some misc variables {{{
################################################################################
# read configuration files, set some misc variables {{{
@@
-61,9
+61,10
@@
Usage: $PN [-c <classe[s]>] [-t <target_directory>] [-s <suite> [-Fvh]
Usage examples:
$PN
Usage examples:
$PN
- $PN -c GRML,I386 -t /dev/shm/grml
- $PN -c GRML,GRML_X,I386 -t /grml/
- $PN -s sid -c GRML,I386
+ $PN -c GRMLBASE,I386 -t /dev/shm/grml
+ $PN -c GRMLBASE,GRML_X,I386 -t /grml/
+ $PN -c GRMLBASE,GRML_SMALL,I386
+ $PN -s sid -c GRMLBASE,I386
More details: man grml-live
/usr/share/doc/grml-live/grml-live.html
More details: man grml-live
/usr/share/doc/grml-live/grml-live.html
@@
-106,10
+107,10
@@
specify it on the command line using the -t|--target option."
# ask user whether the setup is ok {{{
if [ -z "$FORCE" ] ; then
echo
# ask user whether the setup is ok {{{
if [ -z "$FORCE" ] ; then
echo
- echo "$PN - check your configuration (or invoke using -F to force execution without prompting)"
+ echo "$PN - check your configuration (or invoke using -F to force execution without prompting)
:
"
echo
echo " FAI classes: $CLASSES"
echo
echo " FAI classes: $CLASSES"
- echo "
output directory:
$TARGET"
+ echo "
main directory:
$TARGET"
[ -n "$CHROOT_TARGET" ] && echo " chroot target: $CHROOT_TARGET"
[ -n "$BUILD_TARGET" ] && echo " build target: $BUILD_TARGET"
[ -n "$ISO_TARGET" ] && echo " ISO target: $ISO_TARGET"
[ -n "$CHROOT_TARGET" ] && echo " chroot target: $CHROOT_TARGET"
[ -n "$BUILD_TARGET" ] && echo " build target: $BUILD_TARGET"
[ -n "$ISO_TARGET" ] && echo " ISO target: $ISO_TARGET"
@@
-155,7
+156,14
@@
else
fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" dirinstall "$CHROOT_TARGET" $FAI_ARGS
umount $CHROOT_TARGET/proc 2>/dev/null || /bin/true
umount $CHROOT_TARGET/sys 2>/dev/null || /bin/true
fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" dirinstall "$CHROOT_TARGET" $FAI_ARGS
umount $CHROOT_TARGET/proc 2>/dev/null || /bin/true
umount $CHROOT_TARGET/sys 2>/dev/null || /bin/true
- echo " [*] Finished execution of stage 'fai dirinstall'"
+ # notice: 'fai dirinstall' does not seem to exit appropriate ->
+ # we need better error handling
+ if [ -r "$CHROOT_TARGET"/etc/grml_cd ] ; then
+ echo " [*] Finished execution of stage 'fai dirinstall'"
+ else
+ echo " [!] There was an error during execution of stage 'fai dirinstall'"
+ exit 1
+ fi
fi
# }}}
fi
# }}}
@@
-251,4
+259,4
@@
bailout 0
# }}}
## END OF FILE #################################################################
# }}}
## END OF FILE #################################################################
-# vim:foldmethod=marker ts=2 ft=sh ai expandtab tw=80 sw=
2
+# vim:foldmethod=marker ts=2 ft=sh ai expandtab tw=80 sw=
3