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 auctex to GRML_FULL
[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
ac85fd9
..
715888c
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 12 11:14:32
CET 2007 [mika]
+# Latest change:
Sun Dec 16 18:31:59
CET 2007 [mika]
################################################################################
set -u
################################################################################
set -u
@@
-13,15
+13,21
@@
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
+[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
+[ -n "$HOSTNAME" ] || HOSTNAME=grml
+echo "$HOSTNAME" > $target/etc/hostname
+
if [ "$FAI_ACTION" = "softupdate" ] ; then
echo "Softupdate of FAI via grml-live running"
if [ -r /etc/resolv.conf ] ; then
if [ "$FAI_ACTION" = "softupdate" ] ; then
echo "Softupdate of FAI via grml-live running"
if [ -r /etc/resolv.conf ] ; then
- if [ -r $target/etc/resolvconf/run/resolv.conf ] ; then
- cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
- else
- cat /etc/resolv.conf >> $target/etc/resolv.conf
- fi
+
if [ -r $target/etc/resolvconf/run/resolv.conf ] ; then
+
cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
+
else
+
cat /etc/resolv.conf >> $target/etc/resolv.conf
+
fi
fi
if [ -r $target/etc/policy-rc.d.conf ] ; then
fi
if [ -r $target/etc/policy-rc.d.conf ] ; then
@@
-51,6
+57,8
@@
EOF
fi
fi
fi
fi
+ # FAI softupdate executes upgrade only with the sources.list being
+ # present in the chroot :-/ - so let's do it on our own:
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
@@
-58,10
+66,15
@@
EOF
cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list
fi
cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list
fi
- # FAI softupdate does not execute upgrade, so let's do it on our own:
+ # run it on our own, as updatebase is used at the wrong stage for our needs,
+ # see /etc/grml/fai/config/hooks/updatebase.GRMLBASE
$ROOTCMD apt-get update
$ROOTCMD apt-get update
+ if ! [ -x $target/usr/bin/aptitude ] ; then
+ $ROOTCMD apt-get -y install aptitude
+ fi
+
if [ -x $target/usr/bin/aptitude ] ; then
if [ -x $target/usr/bin/aptitude ] ; then
- if
strings $target/usr/bin/aptitude | grep safe-upgrade 1>/dev/null
; then
+ if
$ROOTCMD aptitude --help | grep -q safe-upgrade
; then
$ROOTCMD aptitude -y safe-upgrade
else
$ROOTCMD aptitude -y upgrade
$ROOTCMD aptitude -y safe-upgrade
else
$ROOTCMD aptitude -y upgrade
@@
-78,6
+91,7
@@
echo "Acquire::http::Pipeline-Depth "0"; // added by grml-live" >> $target/etc/a
# Recommends just pull in way tooooo much packages, so disable it:
echo "APT::Install-Recommends "false"; // added by grml-live" >> $target/etc/apt/apt.conf
# Recommends just pull in way tooooo much packages, so disable it:
echo "APT::Install-Recommends "false"; // added by grml-live" >> $target/etc/apt/apt.conf
+echo "Aptitude::Recommends-Important "false"; // added by grml-live" >> $target/etc/apt/apt.conf
# install grml keys:
gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787 || \
# install grml keys:
gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787 || \