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:
d0ee035
)
Some more FAI error checking
author
Michael Prokop
<mika@grml.org>
Wed, 10 Oct 2007 07:39:01 +0000
(09:39 +0200)
committer
Michael Prokop
<mika@grml.org>
Wed, 10 Oct 2007 07:39:01 +0000
(09:39 +0200)
debian/changelog
patch
|
blob
|
history
grml-live
patch
|
blob
|
history
diff --git
a/debian/changelog
b/debian/changelog
index
6c182c5
..
c4427db
100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-5,6
+5,7
@@
grml-live (0.0.5) unstable; urgency=low
- grml-live_autobuild_grml-small_sid.sh
- grml-live_autobuild_grml64-small_etch.sh
- grml-live_autobuild_grml64-small_sid.sh
- grml-live_autobuild_grml-small_sid.sh
- grml-live_autobuild_grml64-small_etch.sh
- grml-live_autobuild_grml64-small_sid.sh
+ * Some more FAI error checking.
* Add new packages to GRML_FULL:
- pristine-tar
* Add new packages to GRML_FULL:
- pristine-tar
diff --git
a/grml-live
b/grml-live
index
36359b0
..
f781b62
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:
Sat Oct 06 18:28:57
CEST 2007 [mika]
+# Latest change:
Mit Okt 10 09:38:42
CEST 2007 [mika]
################################################################################
# read configuration files, set some misc variables {{{
################################################################################
# read configuration files, set some misc variables {{{
@@
-268,6
+268,8
@@
else
ERROR=''
if [ -r "/var/log/fai/dirinstall/$HOSTNAME/software.log" ] ; then
grep 'dpkg: error processing' /var/log/fai/dirinstall/$HOSTNAME/software.log >> $LOGFILE && ERROR=1
ERROR=''
if [ -r "/var/log/fai/dirinstall/$HOSTNAME/software.log" ] ; then
grep 'dpkg: error processing' /var/log/fai/dirinstall/$HOSTNAME/software.log >> $LOGFILE && ERROR=1
+ grep 'E: Method http has died unexpectedly!' /var/log/fai/dirinstall/$HOSTNAME/software.log >> $LOGFILE && ERROR=2
+ grep 'ERROR: chroot' /var/log/fai/dirinstall/$HOSTNAME/software.log >> $LOGFILE && ERROR=3
fi
if [ -r "/var/log/fai/dirinstall/$HOSTNAME/shell.log" ] ; then
fi
if [ -r "/var/log/fai/dirinstall/$HOSTNAME/shell.log" ] ; then
@@
-275,10
+277,11
@@
else
fi
if [ -n "$ERROR" ] ; then
fi
if [ -n "$ERROR" ] ; then
- log "There was an error during execution of stage 'fai dirinstall' [$(date)]"
+ log "There was an error
[${ERROR}]
during execution of stage 'fai dirinstall' [$(date)]"
eerror "There was an error during execution of stage 'fai dirinstall'"
echo " Check out /var/log/fai/dirinstall/$HOSTNAME/ for details. [exit ${ERROR}]"
eerror "There was an error during execution of stage 'fai dirinstall'"
echo " Check out /var/log/fai/dirinstall/$HOSTNAME/ for details. [exit ${ERROR}]"
- eend 1 ; exit 1
+ eend 1
+ bailout 1
else
log "Finished execution of stage 'fai dirinstall' [$(date)]"
einfo "Finished execution of stage 'fai dirinstall'"
else
log "Finished execution of stage 'fai dirinstall' [$(date)]"
einfo "Finished execution of stage 'fai dirinstall'"