projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
94a95c0
)
instsoft.GRMLBASE: do not run explicit apt-get update any longer
author
Michael Prokop
<mika@grml.org>
Sat, 26 Nov 2011 16:46:59 +0000
(17:46 +0100)
committer
Michael Prokop
<mika@grml.org>
Sat, 26 Nov 2011 20:20:17 +0000
(21:20 +0100)
etc/grml/fai/config/hooks/instsoft.GRMLBASE
patch
|
blob
|
history
diff --git
a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index
9d37e12
..
4b36e51
100755
(executable)
--- a/
etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/
etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@
-60,15
+60,6
@@
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
- # run it on our own, as updatebase is used at the wrong stage for our needs,
- # see ${GRML_FAI_CONFIG}/hooks/updatebase.GRMLBASE
- # the apt-get update might return an error if there's for example
- # a hashsum mismatch on Debian mirror sources, we might want to continue
- # but should warn the user
- if ! $ROOTCMD apt-get update ; then
- echo "Warning: there was an error executing apt-get update, continuing anyway."
- fi
-
# work around /etc/kernel/postinst.d/zz-update-grub failing
# inside openvz environment, see #597084
if ! $ROOTCMD dpkg-divert --list | grep -q '/usr/sbin/update-grub' ; then
# work around /etc/kernel/postinst.d/zz-update-grub failing
# inside openvz environment, see #597084
if ! $ROOTCMD dpkg-divert --list | grep -q '/usr/sbin/update-grub' ; then