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:
936f2be
)
Use /etc/debian_version as chroot existence check
author
Michael Prokop
<mika@grml.org>
Wed, 26 Aug 2009 21:09:03 +0000
(23:09 +0200)
committer
Michael Prokop
<mika@grml.org>
Wed, 26 Aug 2009 21:09:03 +0000
(23:09 +0200)
debian/changelog
patch
|
blob
|
history
grml-live
patch
|
blob
|
history
diff --git
a/debian/changelog
b/debian/changelog
index
f13a356
..
f948829
100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-7,8
+7,12
@@
grml-live (0.9.22) UNRELEASED; urgency=low
- Add libsmbios-bin to GRML_FULL (thanks to Christian Bricart).
- Replace nessusclient, nessusd and nessus-plugins with
openvas-client and openvas-server in GRML_FULL.
- Add libsmbios-bin to GRML_FULL (thanks to Christian Bricart).
- Replace nessusclient, nessusd and nessus-plugins with
openvas-client and openvas-server in GRML_FULL.
+ * Do not use /etc/grml_version but instead use /etc/debian_version
+ as check whether the chroot exists. If grml-live execution
+ itself succeded but was interrupted during task_configure it should
+ be fine to re-run grml-live with -u/-b options.
- -- Michael Prokop <mika@grml.org> Wed, 26 Aug 2009
00:16:38
+0200
+ -- Michael Prokop <mika@grml.org> Wed, 26 Aug 2009
23:06:53
+0200
grml-live (0.9.21) unstable; urgency=low
grml-live (0.9.21) unstable; urgency=low
diff --git
a/grml-live
b/grml-live
index
9e6d068
..
e2dd602
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-470,7
+470,7
@@
else
fi
if [ -n "$UPDATE" -o -n "$BUILD_ONLY" ] ; then
fi
if [ -n "$UPDATE" -o -n "$BUILD_ONLY" ] ; then
- if ! [ -r "$CHROOT_OUTPUT/etc/
grml
_version" ] ; then
+ if ! [ -r "$CHROOT_OUTPUT/etc/
debian
_version" ] ; then
log "Error: does not look like you have a working chroot. Updating/building not possible."
eerror "Error: does not look like you have a working chroot. Updating/building not possible. (Drop -u/-b option?)"
eend 1
log "Error: does not look like you have a working chroot. Updating/building not possible."
eerror "Error: does not look like you have a working chroot. Updating/building not possible. (Drop -u/-b option?)"
eend 1