From: Michael Prokop Date: Wed, 26 Aug 2009 21:09:03 +0000 (+0200) Subject: Use /etc/debian_version as chroot existence check X-Git-Tag: v0.9.22~19 X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=8e40fce98aefa49f6f103f0b6b2648e2d1fe099a Use /etc/debian_version as chroot existence check --- diff --git a/debian/changelog b/debian/changelog index f13a356..f948829 100644 --- 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. + * 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 Wed, 26 Aug 2009 00:16:38 +0200 + -- Michael Prokop Wed, 26 Aug 2009 23:06:53 +0200 grml-live (0.9.21) unstable; urgency=low diff --git a/grml-live b/grml-live index 9e6d068..e2dd602 100755 --- a/grml-live +++ b/grml-live @@ -470,7 +470,7 @@ else 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