X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=Makefile;h=1d8d694ca7038f5ba7d98d8fc94cc78334744f69;hb=92e6774b777c825714d3f74edb1a4bd00971d995;hp=84c9221595f947f9196b53951fb96eed5193944a;hpb=880830df1fc51677a4dc72a56fd46cddfc1676dc;p=blast

diff --git a/Makefile b/Makefile
index 84c9221..1d8d694 100644
--- a/Makefile
+++ b/Makefile
@@ -32,17 +32,26 @@ 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
-endef
+  ifneq "$(filter stretch jessie buster, ${release})" ""
+    define SOURCES := 
+    deb	http://cdn.debian.net/debian	${release}	main
+    deb	https://deb.debian.org/debian-security/	${release}/updates	main
+    endef
+  else
+    define SOURCES := 
+    deb	http://cdn.debian.net/debian	${release}	main
+    deb	https://deb.debian.org/debian-security/	${release}-security	main
+    endef
+  endif
 endif
 
 ifdef disk
@@ -383,8 +392,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" ] && \