X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=bbc91f095bac7c743ac67066a1808d303396348f;hp=751eac3f714d0568c5b2ab6d88c126406fce12e6;hb=4f436b493216046d6e77eeb486a6e91d13ba887f;hpb=4f9ea9128412213f405416da7f15c3f329857f12

diff --git a/chroot-script b/chroot-script
index 751eac3..bbc91f0 100755
--- a/chroot-script
+++ b/chroot-script
@@ -18,19 +18,19 @@
 
 # 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"
-      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"
-      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"
-   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
@@ -136,9 +136,9 @@ grmlrepos() {
 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
@@ -234,7 +234,7 @@ upgrade_system() {
 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
@@ -292,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
@@ -317,6 +317,8 @@ kernel() {
      # note: install busybox to be able to debug initramfs
      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
 }
 # }}}
@@ -426,6 +428,20 @@ EOF
 }
 # }}}
 
+# set default locales {{{
+default_locales() {
+  if [ -n "$DEFAULT_LOCALES" ] ; then
+    if ! [ -x /usr/sbin/update-locale ] ; then
+      echo "Warning: update-locale executable not available (no locales package installed?)"
+      echo "Ignoring request to run update-locale for $DEFAULT_LOCALES therefore"
+      return 0
+    fi
+
+    /usr/sbin/update-locale LANG="$DEFAULT_LOCALES"
+  fi
+}
+# }}}
+
 # adjust timezone {{{
 timezone() {
   if [ -n "$TIMEZONE" ] ; then
@@ -606,7 +622,7 @@ trap signal_handler HUP INT QUIT TERM
 
  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