X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F99-finish-grml-build;h=da74934e7622e009793b3e326560bd0876cb6e2f;hb=7bbfd24bb59bead0491ff8cb5ab7fa8fe6dee619;hp=4d727bc40dc5d8623d6cb923cf3003d6ec016b37;hpb=bed0a7081d65b7e916678f2117d1b981f91843b9;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
index 4d727bc..da74934 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
+++ b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
@@ -1,19 +1,27 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      /etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
 # Purpose:       finalize grml chroot build
 # 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 Oct 15 19:12:13 CEST 2007 [mika]
 ################################################################################
 
 set -u
 set -e
 
-# Restore usual Debian behaviour which has been changed
-# for FAI via /etc/grml/fai/config/hooks/instsoft.GRMLBASE
-if [ -r $target/etc/apt/apt.conf ] ; then
-   sed -i "s#Acquire::http::Pipeline-Depth.*#// &#" $target/etc/apt/apt.conf
+# Restore usual Debian behaviour
+#if [ -r "$target"/etc/apt/apt.conf.d/15grml-live ] ; then
+#   rm -f "$target"/etc/apt/apt.conf.d/15grml-live
+#fi
+
+# Restore original state from softupdate:
+if [ -r $target/etc/policy-rc.d.conf ] ; then
+   sed -i "s/EXITSTATUS='101'/EXITSTATUS='0'/" $target/etc/policy-rc.d.conf
+fi
+
+# remove an existing /etc/debian_chroot file:
+if [ -r $target/etc/debian_chroot ] ; then
+   rm -f $target/etc/debian_chroot
 fi
 
 # /etc/grml_cd makes the live system recognizable as a live system