projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release new version 0.60
[grml-debootstrap.git]
/
chroot-script
diff --git
a/chroot-script
b/chroot-script
index
28684dd
..
bbc91f0
100755
(executable)
--- a/
chroot-script
+++ b/
chroot-script
@@
-18,19
+18,19
@@
# use aptitude only if it's available
if [ -x /usr/bin/aptitude ] ; then
# use aptitude only if it's available
if [ -x /usr/bin/aptitude ] ; then
- APTUPDATE=
'aptitude update'
+ APTUPDATE=
"aptitude update $DPKG_OPTIONS"
# Debian ISOs do not contain signed Release files
if [ -n "$ISO" ] ; then
APTINSTALL="aptitude -y --allow-untrusted --without-recommends install $DPKG_OPTIONS"
# Debian ISOs do not contain signed Release files
if [ -n "$ISO" ] ; then
APTINSTALL="aptitude -y --allow-untrusted --without-recommends install $DPKG_OPTIONS"
- APTUPGRADE=
'aptitude -y --allow-untrusted safe-upgrade'
+ APTUPGRADE=
"aptitude -y --allow-untrusted safe-upgrade $DPKG_OPTIONS"
else
APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS"
else
APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS"
- APTUPGRADE=
'aptitude -y safe-upgrade'
+ APTUPGRADE=
"aptitude -y safe-upgrade $DPKG_OPTIONS"
fi
else
APTINSTALL="apt-get --force-yes -y --no-install-recommends install $DPKG_OPTIONS"
fi
else
APTINSTALL="apt-get --force-yes -y --no-install-recommends install $DPKG_OPTIONS"
- APTUPDATE=
'apt-get update'
- APTUPGRADE=
'apt-get --force-yes -y upgrade'
+ APTUPDATE=
"apt-get update $DPKG_OPTIONS"
+ APTUPGRADE=
"apt-get --force-yes -y upgrade $DPKG_OPTIONS"
fi
if [ -z "$STAGES" ] ; then
fi
if [ -z "$STAGES" ] ; then
@@
-136,9
+136,9
@@
grmlrepos() {
EOF
fi
EOF
fi
- if apt-get update ; then
- apt-get -y --allow-unauthenticated install grml-debian-keyring
- apt-get update
+ if apt-get update
$DPKG_OPTIONS
; then
+ apt-get -y --allow-unauthenticated install grml-debian-keyring
$DPKG_OPTIONS
+ apt-get update
$DPKG_OPTIONS
else
# make sure we have the keys available for aptitude
gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787
else
# make sure we have the keys available for aptitude
gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787
@@
-234,7
+234,7
@@
upgrade_system() {
remove_apt_cache() {
if [ "$RM_APTCACHE" = 'yes' ] ; then
echo "Cleaning apt cache."
remove_apt_cache() {
if [ "$RM_APTCACHE" = 'yes' ] ; then
echo "Cleaning apt cache."
- apt-get clean
+ apt-get clean
$DPKG_OPTIONS
else
echo "Not cleaning apt cache as \$RM_APTCACHE is unset."
fi
else
echo "Not cleaning apt cache as \$RM_APTCACHE is unset."
fi