X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F99-finish-grml-build;h=0f1b9d6d4fbfbed83fbfaa7fb8fa6026187a567f;hb=78b2757daaad5f7878b3ebd7d911cdc7cb9690eb;hp=bab5277769c34658bbe725af15b4dcc4bfcc3716;hpb=7ca02816220f36c7db5ca4fe3753990b5c4bc3b2;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 bab5277..0f1b9d6 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,17 @@ -#!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build +#!/bin/bash +# Filename: ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/99-finish-grml-build # Purpose: finalize grml chroot build # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Mon Okt 29 10:46:02 CET 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 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: @@ -25,4 +23,4 @@ fi touch $target/etc/grml_cd ## END OF FILE ################################################################# -# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3 +# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2