projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use /usr/bin/vim.tiny as alternativ for vi
[grml-live.git]
/
etc
/
grml
/
fai
/
config
/
scripts
/
GRMLBASE
/
99-finish-grml-build
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
77ebe56
..
33d9b73
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
@@
-4,7
+4,7
@@
# 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.
# 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: Sun
Nov 04 11:20:5
5 CET 2007 [mika]
+# Latest change: Sun
Dec 16 18:33:1
5 CET 2007 [mika]
################################################################################
set -u
################################################################################
set -u
@@
-13,8
+13,9
@@
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
# 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
+ sed -i "s#^Aptitude::Recommends-Important.*#// &#" $target/etc/apt/apt.conf
fi
# Restore original state from softupdate:
fi
# Restore original state from softupdate:
@@
-22,6
+23,13
@@
if [ -r $target/etc/policy-rc.d.conf ] ; then
sed -i "s/EXITSTATUS='101'/EXITSTATUS='0'/" $target/etc/policy-rc.d.conf
fi
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
rm -f $target/etc/debian_chroot
# remove an existing /etc/debian_chroot file:
if [ -r $target/etc/debian_chroot ] ; then
rm -f $target/etc/debian_chroot