X-Git-Url: http://git.plutz.net/?p=blast;a=blobdiff_plain;f=Makefile;fp=Makefile;h=099e2f060537b7491aa8f39be94a517720f7d1eb;hp=84c9221595f947f9196b53951fb96eed5193944a;hb=ff53964537cc7f6bf250839dfe77e971975fb50a;hpb=1ffe031dc21b7d4ea286c8474535b47e8523384e 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" ] && \