X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=023ccff5cb5917d1733f23ac1d48f59088d8bc9a;hp=7d2c8c3c398e2e8f6be461a596d4b0f68a1125b6;hb=d17c54b54e79379c7aa485d8caf90d963aa72bd7;hpb=ec9993610d2420c509e2eb4255811d72ffe15dbd

diff --git a/chroot-script b/chroot-script
index 7d2c8c3..023ccff 100755
--- a/chroot-script
+++ b/chroot-script
@@ -17,9 +17,11 @@
 if [ -x /usr/bin/aptitude ] ; then
    APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS"
    APTUPDATE='aptitude update'
+   APTUPGRADE='aptitude -y safe-upgrade'
 else
    APTINSTALL="apt-get --force-yes -y --no-install-recommends install $DPKG_OPTIONS"
    APTUPDATE='apt-get update'
+   APTUPGRADE='apt-get --force-yes -y upgrade'
 fi
 
 if [ -z "$STAGES" ] ; then
@@ -158,6 +160,18 @@ EOF
 }
 # }}}
 
+# make sure we have an up2date system {{{
+upgrade_system() {
+  if [ "$UPGRADE_SYSTEM" = "yes" ] ; then
+    echo "Running update + upgrade"
+    $APTUPDATE
+    $APTUPGRADE
+  else
+    echo "Not running update + upgrade as \$UPDATE_AND_UPGRADE is not set to 'yes'."
+  fi
+}
+
+# }}}
 # remove now useless apt cache {{{
 remove_apt_cache() {
   if [ "$RM_APTCACHE" = 'yes' ] ; then
@@ -510,7 +524,7 @@ trap signal_handler HUP INT QUIT TERM
  for i in chrootmirror grmlrepos kernelimg_conf \
      kernel packages extrapackages  reconfigure hosts interfaces \
      timezone fstab hostname initrd grub_install passwords        \
-     custom_scripts remove_apt_cache services ; do
+     custom_scripts upgrade_system remove_apt_cache services ; do
      if stage $i ; then
        $i && stage $i done || exit 1
      fi