projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
config/hooks/instsoft.GRMLBASE: force installation of file-rc
[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
a678e38
..
e92ec5e
100755
(executable)
--- a/
etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/
etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@
-58,6
+58,9
@@
EOF
rm $target/etc/apt/sources.list
fi
cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list.d/grml-live.list
rm $target/etc/apt/sources.list
fi
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,
@@
-124,7
+127,9
@@
fi
# make sure we have file-rc available before
# package_config/GRML is being executed:
$ROOTCMD apt-get update
# make sure we have file-rc available before
# package_config/GRML is being executed:
$ROOTCMD apt-get update
-$ROOTCMD aptitude -f -y install file-rc
+# newer aptitude versions won't remove essential packages using
+# 'aptitude -f -y install file-rc' anymore, therefore force it:
+$ROOTCMD aptitude -o Aptitude::ProblemResolver::Keep-All-Tier=60000 -f -y install file-rc
# we definitely don't want to fail running fai dirinstall just
# because of some well known bugs:
# we definitely don't want to fail running fai dirinstall just
# because of some well known bugs: