projects
/
grml-live-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove vifm again, still causing problems in initial installation
[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
63ae67d
..
2a00b39
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: Sun Nov 04 1
1:08:53
CET 2007 [mika]
+# Latest change: Sun Nov 04 1
4:37:26
CET 2007 [mika]
################################################################################
set -u
################################################################################
set -u
@@
-22,7
+22,11
@@
if [ "$FAI_ACTION" = "softupdate" ] ; then
else
cat /etc/resolv.conf >> $target/etc/resolv.conf
fi
else
cat /etc/resolv.conf >> $target/etc/resolv.conf
fi
- fi
+ fi
+
+ if [ -r $target/etc/policy-rc.d.conf ] ; then
+ sed -i "s/EXITSTATUS=.*/EXITSTATUS='101'/" $target/etc/policy-rc.d.conf
+ fi
# make sure we prefer grml repository:
if [ -r /etc/grml/fai/apt/preferences ] ; then
# make sure we prefer grml repository:
if [ -r /etc/grml/fai/apt/preferences ] ; then
@@
-36,7
+40,17
@@
if [ "$FAI_ACTION" = "softupdate" ] ; then
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:
$ROOTCMD apt-get update
$ROOTCMD apt-get update
+ if [ -x $target/usr/bin/aptitude ] ; then
+ if strings $target/usr/bin/aptitude | grep safe-upgrade 1>/dev/null ; then
+ $ROOTCMD aptitude -y safe-upgrade
+ else
+ $ROOTCMD aptitude -y upgrade
+ fi
+ else
+ $ROOTCMD apt-get -y upgrade
+ fi
else # no softupdate but fresh installation
else # no softupdate but fresh installation