projects
/
grml-live-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add keychain to GRML_MEDIUM and GRML_SMALL
[grml-live-grml.git]
/
etc
/
grml
/
fai
/
config
/
hooks
/
instsoft.GRMLBASE
diff --git
a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index
15093e4
..
7222028
100755
(executable)
--- a/
etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/
etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@
-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: Mon Nov
05 22:48:0
2 CET 2007 [mika]
+# Latest change: Mon Nov
12 11:14:3
2 CET 2007 [mika]
################################################################################
set -u
################################################################################
set -u
@@
-13,6
+13,11
@@
set -e
# visualize chroot inside zsh:
echo grml_chroot > $target/etc/debian_chroot
# visualize chroot inside zsh:
echo grml_chroot > $target/etc/debian_chroot
+HOSTNAME=''
+[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
+[ -n "$HOSTNAME" ] || HOSTNAME=grml
+echo "$HOSTNAME" > $target/etc/hostname
+
if [ "$FAI_ACTION" = "softupdate" ] ; then
echo "Softupdate of FAI via grml-live running"
if [ "$FAI_ACTION" = "softupdate" ] ; then
echo "Softupdate of FAI via grml-live running"
@@
-44,6
+49,13
@@
if [ "$FAI_ACTION" = "softupdate" ] ; then
//DPkg::Tools::Options::/usr/sbin/apt-listbugs::Version "2";
EOF
//DPkg::Tools::Options::/usr/sbin/apt-listbugs::Version "2";
EOF
+ # make sure we can handle kernel upgrades:
+ if [ -r $target/etc/kernel-img.conf ] ; then
+ if ! grep -q "silent_modules = Yes" $target/etc/kernel-img.conf ; then
+ echo "silent_modules = Yes" >> $target/etc/kernel-img.conf
+ fi
+ fi
+
if [ -r /etc/grml/fai/apt/sources.list ] ; then
if [ -L $target/etc/apt/sources.list ] ; then
rm $target/etc/apt/sources.list
if [ -r /etc/grml/fai/apt/sources.list ] ; then
if [ -L $target/etc/apt/sources.list ] ; then
rm $target/etc/apt/sources.list