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
include $(addsuffix .mk, $(addprefix modules/, $(subst ${comma_},${space_},${modules})))
endif
-ifeq "${ARCH}" "amd64"
+ifeq "$(findstring linux-image, ${PACKAGES})" "linux-image"
+else ifeq "${ARCH}" "amd64"
PACKAGES += linux-image-amd64
else ifeq "${ARCH}" "i386"
PACKAGES += linux-image-686
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" ] && \