X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=chroot-script;h=8feccfaeaf68cef7255ece8d16bcf862ff4ef1a9;hb=refs%2Fheads%2Fmika%2Fc-utf8;hp=90d3f233763b8262cfbf0a4e74a003a425c1cc2e;hpb=218bf66658420382b5cfa9597e1c430523e50ca7;p=grml-debootstrap.git

diff --git a/chroot-script b/chroot-script
index 90d3f23..8feccfa 100755
--- a/chroot-script
+++ b/chroot-script
@@ -2,7 +2,7 @@
 # Filename:      /etc/debootstrap/chroot-script
 # Purpose:       script executed in chroot when installing Debian via grml-debootstrap
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
-# Bug-Reports:   see http://grml.org/bugs/
+# Bug-Reports:   see https://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
@@ -113,10 +113,16 @@ chrootmirror() {
   # add security.debian.org:
   case "$RELEASE" in
     unstable|sid|lenny) ;;  # no security pool available
-    *)
+    squeeze|wheezy|jessie|stretch|buster)
       echo "Adding security.debian.org to sources.list."
       echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list
       ;;
+    *)
+      # bullseye and newer releases use a different repository layout, see
+      # https://lists.debian.org/debian-devel-announce/2019/07/msg00004.html
+      echo "Adding security.debian.org/debian-security to sources.list."
+      echo "deb http://security.debian.org/debian-security ${RELEASE}-security $COMPONENTS" >> /etc/apt/sources.list
+      ;;
   esac
 }
 # }}}
@@ -436,15 +442,15 @@ 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 LANGUAGE="$DEFAULT_LANGUAGE" LANG="$DEFAULT_LOCALES"
+  if ! [ -x "$(command -v update-locale)" ] ; then
+    echo "Warning: update-locale executable not available (no locales package installed?)"
+    echo "Ignoring request to run update-locale for C.UTF-8 therefore"
+    return 0
   fi
+
+  echo "Setting C.UTF-8 as default LANG"
+  /usr/sbin/update-locale LANG='C.UTF-8'
+  echo 'locales locales/default_environment_locale select C.UTF-8' | debconf-set-selections
 }
 # }}}