X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F99-finish-grml-build;h=ef117ae00a06bce64e22462bf4c5e6a43451a424;hb=38068281cf1adbc2218085592f5f884be6a1f564;hp=7b03524bba0458d4c30536993be948e2be4b181e;hpb=bddded93df88ad91d9ad8590950ce62a3b2e2e38;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 7b03524..ef117ae 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
+++ b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
@@ -1,10 +1,9 @@
-#!/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: Thu Nov 01 16:19:52 CET 2007 [mika]
 ################################################################################
 
 set -u
@@ -13,11 +12,23 @@ 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
-   sed -i "s#APT::Install-Recommends.*#// &#"       $target/etc/apt/apt.conf
+   sed -i "s#^Acquire::http::Pipeline-Depth.*#// &#"  $target/etc/apt/apt.conf
+   sed -i "s#^APT::Install-Recommends.*#// &#"        $target/etc/apt/apt.conf
+   # Notice: deprecated since aptitude (0.4.11-1):
+   sed -i "s#^Aptitude::Recommends-Important.*#// &#" $target/etc/apt/apt.conf
 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
 
+# Restore usual behaviour:
+if [ -r $target/etc/kernel-img.conf ] ; then
+   if grep -q "silent_modules = Yes" $target/etc/kernel-img.conf ; then
+      sed -i "s/silent_modules = Yes/# &/" $target/etc/kernel-img.conf
+   fi
+fi
 
 # remove an existing /etc/debian_chroot file:
 if [ -r $target/etc/debian_chroot ] ; then