projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add libnss-mdns to GRML_FULL
[grml-live.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
bbabb90
..
df99f5b
100755
(executable)
--- a/
etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/
etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@
-57,7
+57,10
@@
EOF
if [ -L $target/etc/apt/sources.list ] ; then
rm $target/etc/apt/sources.list
fi
if [ -L $target/etc/apt/sources.list ] ; then
rm $target/etc/apt/sources.list
fi
- cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list
+ cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list.d/grml-live.list
+ if [ -r $target/etc/apt/sources.list.d/grml.list ] ; then
+ mv $target/etc/apt/sources.list.d/grml.list $target/etc/apt/sources.list.d/grml.unused
+ fi
fi
# run it on our own, as updatebase is used at the wrong stage for our needs,
fi
# run it on our own, as updatebase is used at the wrong stage for our needs,
@@
-69,12
+72,12
@@
EOF
if [ -x $target/usr/bin/aptitude ] ; then
if $ROOTCMD aptitude --help | grep -q safe-upgrade ; then
if [ -x $target/usr/bin/aptitude ] ; then
if $ROOTCMD aptitude --help | grep -q safe-upgrade ; then
- $ROOTCMD aptitude -y safe-upgrade
+
APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none
$ROOTCMD aptitude -y safe-upgrade
else
else
- $ROOTCMD aptitude -y upgrade
+
APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none
$ROOTCMD aptitude -y upgrade
fi
else
fi
else
- $ROOTCMD apt-get -y upgrade
+
APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none
$ROOTCMD apt-get -y upgrade
fi
else # no softupdate but fresh installation
fi
else # no softupdate but fresh installation
@@
-83,7
+86,9
@@
else # no softupdate but fresh installation
if [ -r /etc/grml/fai/files/etc/apt ] ; then
cp -a /etc/grml/fai/files/etc/apt/* $target/etc/apt/
# remove grml-live's sources.list file from chroot:
if [ -r /etc/grml/fai/files/etc/apt ] ; then
cp -a /etc/grml/fai/files/etc/apt/* $target/etc/apt/
# remove grml-live's sources.list file from chroot:
- grep -q GRML_LIVE_SOURCES $target/etc/apt/important_note.txt && rm $target/etc/apt/important_note.txt
+ if [ -r $target/etc/apt/important_note.txt ] ; then
+ grep -q GRML_LIVE_SOURCES $target/etc/apt/important_note.txt && rm $target/etc/apt/important_note.txt
+ fi
fi
# install all present (but at least the grml) gpg keys:
fi
# install all present (but at least the grml) gpg keys:
@@
-124,10
+129,6
@@
fi
$ROOTCMD apt-get update
$ROOTCMD aptitude -f -y install file-rc
$ROOTCMD apt-get update
$ROOTCMD aptitude -f -y install file-rc
-# Workaround #443481 of snort for Debian/etch:
-mkdir -p $target/etc/snort
-echo 'LOGDIR=/var/log/snort' >> $target/etc/snort/snort.common.parameters
-
# we definitely don't want to fail running fai dirinstall just
# because of some well known bugs:
[ -d $target/etc/apt/apt.conf.d ] || mkdir $target/etc/apt/apt.conf.d
# we definitely don't want to fail running fai dirinstall just
# because of some well known bugs:
[ -d $target/etc/apt/apt.conf.d ] || mkdir $target/etc/apt/apt.conf.d