X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=7caf4dded5eb7ff9a316d016bb11502ceb123e3f;hp=84086cc1b68649325dd55140ef28d8b0b9f9dd27;hb=4d08103ac3162e4e71b932d0da8dca8846d94b3c;hpb=ad7c3cfdaa7c6354c951a9dbbad6ada40a1dc082

diff --git a/chroot-script b/chroot-script
index 84086cc..7caf4dd 100755
--- a/chroot-script
+++ b/chroot-script
@@ -5,6 +5,9 @@
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 ################################################################################
+# GRML_CHROOT_SCRIPT_MARKER - do not remove this line unless you want to keep
+# this script as /bin/chroot-script on your new installed system
+################################################################################
 
 . /etc/debootstrap/config    || exit 1
 . /etc/debootstrap/variables || exit 1
@@ -17,9 +20,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
@@ -92,7 +97,6 @@ grmlrepos() {
      # user might have provided their own apt sources.list
      if ! grep -q grml /etc/apt/sources.list.d/grml.list 2>/dev/null ; then
         cat >> /etc/apt/sources.list.d/grml.list << EOF
-
 # grml: stable repository:
   deb     http://deb.grml.org/ grml-stable  main
   deb-src http://deb.grml.org/ grml-stable  main
@@ -100,7 +104,6 @@ grmlrepos() {
 # grml: testing/development repository:
   deb     http://deb.grml.org/ grml-testing main
   deb-src http://deb.grml.org/ grml-testing main
-
 EOF
      fi
 
@@ -114,7 +117,7 @@ EOF
        # why it's necessary, sometimes we get an error even though it works [mika]
      fi
 
-     # make sure we install packages from grml's pool only if not available
+     # make sure we install packages from Grml's pool only if not available
      # from Debian!
      if ! grep -q grml /etc/apt/preferences 2>/dev/null ; then
         cat >> /etc/apt/preferences << EOF
@@ -160,6 +163,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
@@ -350,7 +365,6 @@ fi
 
 cat >> /etc/fstab << EOF
 proc           /proc        proc    defaults                      0   0
-/sys           /sys         sysfs   noauto,rw,nosuid,nodev,noexec 0   0
 /dev/cdrom     /mnt/cdrom0  iso9660 ro,user,noauto                0   0
 # some other examples:
 # /dev/sda2       none         swap    sw,pri=0             0   0
@@ -419,8 +433,13 @@ initrd() {
 grub_install() {
 
   if [ -z "$GRUB" ] ; then
-     echo "Notice: \$GRUB not defined, will not install grub therefore."
-     return 0
+    echo "Notice: \$GRUB not defined, will not install grub inside chroot at this stage."
+    return 0
+  fi
+
+  if ! dpkg --list grub-pc 2>/dev/null | grep -q '^ii' ; then
+    echo "Notice: grub option set but no grub-pc package, installing it therefore."
+    DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL grub-pc
   fi
 
   if ! [ -x "$(which grub-install)" ] ; then
@@ -507,7 +526,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