Add bridge-utils to default package list

[grml-debootstrap.git] / chroot-script

diff --git a/chroot-script b/chroot-script
index 3f55747..6d01a89 100755 (executable)
--- a/chroot-script
+++ b/chroot-script
@@ -55,9 +55,9 @@ stage() {
 askpass() {
   # read -s emulation for dash. result is in $resp.
   set -o noglob
-  stty -echo
+  [ -t 0 ] && stty -echo
   read resp
-  stty echo
+  [ -t 0 ] && stty echo
   set +o noglob
 }
 # }}}
@@ -165,6 +165,32 @@ EOF
 }
 # }}}
 
+# check available backports release version {{{
+checkbackports() {
+  wget -q -O/dev/null http://backports.debian.org/debian-backports/dists/${1}-backports/Release
+}
+# }}}
+
+# feature to provide Debian backports repos {{{
+backportrepos() {
+    if [ -n "$BACKPORTREPOS" ] ; then
+        if ! checkbackports $RELEASE ; then
+            echo "Backports for ${RELEASE} are not available." >&2
+            exit 1
+        else
+            # user might have provided their own apt sources.list
+            if ! grep -q backports /etc/apt/sources.list.d/backports.list 2>/dev/null ; then
+                cat >> /etc/apt/sources.list.d/backports.list << EOF
+# debian backports: ${RELEASE}-backports repository:
+deb     http://backports.debian.org/debian-backports ${RELEASE}-backports main
+deb-src http://backports.debian.org/debian-backports ${RELEASE}-backports main
+EOF
+            fi
+        fi
+    fi
+}
+# }}}
+
 # set up kernel-img.conf {{{
 kernelimg_conf() {
   if ! [ -r /etc/kernel-img.conf ] ; then
@@ -266,7 +292,7 @@ get_kernel_version() {
   fi
 
   case $ARCH in
-    i386)   KARCH=i686  ;;
+    i386)   KARCH=686   ;;
     amd64)  KARCH=amd64 ;;
     *)
       echo "Only i386 and amd64 are currently supported" >&2
@@ -289,8 +315,10 @@ kernel() {
   KVER=$(get_kernel_version)
   if [ -n "$KVER" ] ; then
      # note: install busybox to be able to debug initramfs
-     KERNELPACKAGES="linux-image-$KVER linux-headers-$KVER busybox firmware-linux"
+     KERNELPACKAGES="linux-image-$KVER linux-headers-$KVER busybox firmware-linux-free firmware-linux"
      DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES
+  else
+     echo "Warning: Could not find a kernel for your system. Your system won't be able to boot itself!"
   fi
 }
 # }}}
@@ -400,6 +428,14 @@ EOF
 }
 # }}}
 
+# set default locales {{{
+default_locales() {
+  if [ -n "$DEFAULT_LOCALES" ] ; then
+    update-locale LANG="$DEFAULT_LOCALES"
+  fi
+}
+# }}}
+
 # adjust timezone {{{
 timezone() {
   if [ -n "$TIMEZONE" ] ; then
@@ -578,9 +614,9 @@ trap signal_handler HUP INT QUIT TERM
  # always execute install_policy_rcd
  install_policy_rcd
 
- for i in chrootmirror grmlrepos kernelimg_conf \
+ for i in chrootmirror grmlrepos backportrepos kernelimg_conf \
      kernel packages extrapackages  reconfigure hosts interfaces \
-     timezone fstab hostname initrd grub_install passwords        \
+     default_locales timezone fstab hostname initrd grub_install passwords \
      custom_scripts upgrade_system remove_apt_cache services \
      remove_chrootmirror; do
      if stage $i ; then