From: Paul Hänsch <paul@plutz.net>
Date: Sat, 9 Oct 2021 10:26:42 +0000 (+0200)
Subject: enable bullseye built
X-Git-Url: http://git.plutz.net/?a=commitdiff_plain;ds=sidebyside;h=ff53964537cc7f6bf250839dfe77e971975fb50a;p=blast

enable bullseye built
---

diff --git a/Makefile b/Makefile
index 84c9221..099e2f0 100644
--- a/Makefile
+++ b/Makefile
@@ -32,16 +32,18 @@ else
   include ${config}
 endif
 
-ifdef release
-  KEYRING := keys/debian-archive-${release}-stable.gpg
-else
-  release := stretch
-  KEYRING := keys/debian-archive-stretch-stable.gpg
+ifndef release
+  release := bullseye
 endif
 
+KEYRING := keys/debian-archive-${release}-stable.gpg
+KEYRING := keys/debian-archive-${release}-automatic.gpg
+KEYRING := keys/debian-archive-${release}-security-automatic.gpg
+
 ifndef SOURCES
 define SOURCES := 
 deb	http://cdn.debian.net/debian ${release} main
+deb     http://security.debian.org/ ${release}/updates main
 endef
 endif
 
@@ -383,8 +385,8 @@ _bootloader_iso: ${CFGROOT} ${ISOROOT}
 	cp -L "$${CFGROOT}/vmlinuz" "$${CFGROOT}/initrd.img" "$${ISOROOT}"
 	printf '%s\n' "insmod all_video" "set gfxmode=auto" "load_video" "insmod gfxterm" \
 		>"$${ISOROOT}/boot/grub/grub.cfg"
-	printf '%s\n' "set timeout=10" "default=buster" \
-		"menuentry 'Debian Buster' --id 'buster' {" \
+	printf '%s\n' "set timeout=10" "default=${release}" \
+		"menuentry 'Debian ${release}' --id '${release}' {" \
 		"linux '/vmlinuz' boot=live" "initrd '/initrd.img'" "}" \
 		>>"$${ISOROOT}/boot/grub/grub.cfg"
 	-[ -f "$${ISOROOT}/install/initrd.gz" -a -f "$${ISOROOT}/install/linux" ] && \
diff --git a/keys/debian-archive-bullseye-automatic.gpg b/keys/debian-archive-bullseye-automatic.gpg
new file mode 100644
index 0000000..dd04cb1
Binary files /dev/null and b/keys/debian-archive-bullseye-automatic.gpg differ
diff --git a/keys/debian-archive-bullseye-security-automatic.gpg b/keys/debian-archive-bullseye-security-automatic.gpg
new file mode 100644
index 0000000..1c10c2a
Binary files /dev/null and b/keys/debian-archive-bullseye-security-automatic.gpg differ
diff --git a/keys/debian-archive-bullseye-stable.gpg b/keys/debian-archive-bullseye-stable.gpg
new file mode 100644
index 0000000..8ecabc7
Binary files /dev/null and b/keys/debian-archive-bullseye-stable.gpg differ
diff --git a/live-cd.mk b/live-cd.mk
index 780d2eb..b2ec095 100644
--- a/live-cd.mk
+++ b/live-cd.mk
@@ -1,15 +1,16 @@
 iso=live-cd.iso
 
 packages=aqemu,debian-installer-launcher,debootstrap,dnsutils,dosfstools,exfat-fuse,exfat-utils,firefox-esr,firefox-esr-l10n-de,git,gparted,gwenview,make,man-db,manpages-de,mousepad,ncat,network-manager-gnome,ntfs-3g,okular,pavucontrol,pulseaudio,pulseaudio-module-bluetooth,qemu-kvm,qemu-system-gui,qemu-utils,ssh,synaptic,telnet,tmux,vlc,xinput
-packages+=linux-image-4.19.0-11-amd64
+packages+=linux-image-amd64
 packages+=firmware-atheros,firmware-brcm80211,firmware-iwlwifi,firmware-misc-nonfree
 # packages+=firmware-ipw2x00
 
+release=bullseye
+
 define SOURCES :=
 deb     http://cdn.debian.net/debian ${release} main non-free
 endef
 
-release=buster
 modules=nodm,xfce,live,approx
 hostname=live
 rootpass=root
@@ -39,8 +40,8 @@ _config: cfg_root/home/live/.bash_history
 cfg_root/home/live/.bash_history: cfg_root _users
 	mkdir "$${CFGROOT}/home/live"
 	printf '%s\n' \
-		"sudo git clone https://git.plutz.net/git/blast /mnt/blast" \
-		"for m in /proc /sys /dev /run; do sudo mount -o rbind $$m /mnt/$$m; done" \
+		'sudo git clone https://git.plutz.net/git/blast /mnt/blast' \
+		'for m in /proc /sys /dev /run; do sudo mount -o rbind $$m /mnt/$$m; done' \
 		>$@
 	chroot "$${CFGROOT}" chown live:live -R /home/live