X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=96fba0abe60bd9f2fd922053d4b78fdd7eb340a0;hp=80b45ab0ac4740aeecf46d44f7463126d14a4885;hb=refs%2Fheads%2Fmika%2Fboot-append;hpb=7291d0574567d25404915333bad581b4cf82cdf6

diff --git a/chroot-script b/chroot-script
index 80b45ab..96fba0a 100755
--- a/chroot-script
+++ b/chroot-script
@@ -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
 }
 # }}}
@@ -640,6 +646,11 @@ grub_install() {
     return 1
   fi
 
+  if [ -n "${BOOT_APPEND}" ] ; then
+    echo "Adding BOOT_APPEND configuration ['${BOOT_APPEND}'] to /etc/default/grub."
+    sed -i "/GRUB_CMDLINE_LINUX_DEFAULT/ s#\"\$# ${BOOT_APPEND}\"#" /etc/default/grub
+  fi
+
   mountpoint /boot/efi &>/dev/null && umount /boot/efi
 
   $UPDATEGRUB