projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
91e9fb2
)
instsoft.GRMLBASE: make sure we can upgrade automatically even with unsigned repos...
author
Michael Prokop
<mika@grml.org>
Sun, 10 Jul 2011 16:41:03 +0000
(18:41 +0200)
committer
Michael Prokop
<mika@grml.org>
Sun, 10 Jul 2011 16:41:03 +0000
(18:41 +0200)
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
cf73040
..
9d37e12
100755
(executable)
--- a/
etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/
etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@
-85,14
+85,21
@@
EOF
$ROOTCMD apt-get -y install aptitude
fi
$ROOTCMD apt-get -y install aptitude
fi
+ # make sure we can upgrade automatically,
+ # even with unsigned repos, but only if user wants it
+ if [ "${FAI_ALLOW_UNSIGNED:-}" = "1" ] ; then
+ APTGET_OPTS="${APTGET_OPTS:-} --allow-unauthenticated"
+ APTITUDE_OPTS="${APTITUDE_OPTS:-} --allow-untrusted"
+ fi
+
if $ROOTCMD test -x /usr/bin/aptitude ; then
if $ROOTCMD aptitude --help | grep -q safe-upgrade ; then
if $ROOTCMD test -x /usr/bin/aptitude ; then
if $ROOTCMD aptitude --help | grep -q safe-upgrade ; then
- APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y safe-upgrade
+ APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y
$APTITUDE_OPTS
safe-upgrade
else
else
- APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y upgrade
+ APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y
$APTITUDE_OPTS
upgrade
fi
else
fi
else
- APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD apt-get -y --force-yes upgrade
+ APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD apt-get -y
$APTGET_OPTS
--force-yes upgrade
fi
exit # make sure we don't continue behind the following "fi"
fi
exit # make sure we don't continue behind the following "fi"