X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=470a1113d68bb14e32d2c63ac4d29827a784807d;hp=21f4e05293a82c36843a9a3d6f7ad2d554de57ed;hb=586077721fa6533418c4fb7db9b78357fcbbb001;hpb=95778741daf175619a7a0097b2fea1ac16bd005f

diff --git a/chroot-script b/chroot-script
index 21f4e05..470a111 100755
--- a/chroot-script
+++ b/chroot-script
@@ -20,7 +20,7 @@ if [ -x /usr/bin/aptitude ] ; then
    APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS"
    APTUPDATE='aptitude update'
 else
-   APTINSTALL="apt-get --force-yes -y install $DPKG_OPTIONS"
+   APTINSTALL="apt-get --force-yes -y --no-install-recommends install $DPKG_OPTIONS"
    APTUPDATE='apt-get update'
 fi
 
@@ -61,9 +61,23 @@ chrootmirror() {
   if [ -n "$ISO" ] ; then
      echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list
      [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || true
+     # add security.debian.org:
+     case "$RELEASE" in
+       unstable|sid) ;;  # no security pool available
+       *)
+         echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list
+         ;;
+     esac
   else
     if [ -n "$MIRROR" ] ; then
        echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list
+       # add security.debian.org:
+       case "$RELEASE" in
+         unstable|sid) ;;  # no security pool available
+         *)
+           echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list
+           ;;
+       esac
     fi
   fi
 }
@@ -202,7 +216,7 @@ kernel() {
   if [ -n "$KERNEL" ] ; then
      $APTUPDATE
      # note: install busybox to be able to debug initramfs
-     KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL busybox"
+     KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL busybox firmware-linux"
      DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES
   fi
 }