Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update default config in various places post-bullseye 

Closes: #994121
This commit is contained in:
Steve McIntyre 2021-09-22 21:31:48 +01:00
parent fa562c6b07
commit 05a54460d5
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CONF.sh
View File

@ -70,7 +70,7 @@ if [ -z "$DI_CODENAME" ]; then
export DI_CODENAME=$CODENAME export DI_CODENAME=$CODENAME
fi fi
# If you want backported d-i (e.g. by setting # If you want backported d-i (e.g. by setting
# DI_CODENAME=jessie-backports, then you'll almost definitely also # DI_CODENAME=bookworm-backports, then you'll almost definitely also
# want to enable BACKPORTS below as well # want to enable BACKPORTS below as well
# Should we include some packages from backports? If so, point at a # Should we include some packages from backports? If so, point at a
@ -86,8 +86,8 @@ fi
# the Debian mirror. # the Debian mirror.
#export DI_WWW_HOME=default #export DI_WWW_HOME=default
# Version number, "2.2 r0", "2.2 r1" etc. # Version number, "10.11.0", "11.1.0", "testing", etc
export DEBVERSION="11.0.0" export DEBVERSION="12.0.0"
# Official or non-official set. # Official or non-official set.
# NOTE: THE "OFFICIAL" DESIGNATION IS ONLY ALLOWED FOR IMAGES AVAILABLE # NOTE: THE "OFFICIAL" DESIGNATION IS ONLY ALLOWED FOR IMAGES AVAILABLE
@ -208,8 +208,8 @@ export JIGDO_CHECKSUM="md5"
# Extra keys that you might want apt to trust. List their fingerprints # Extra keys that you might want apt to trust. List their fingerprints
# here and debian-cd will grab them from the user's keyring as needed # here and debian-cd will grab them from the user's keyring as needed
# (The example here is the buster release key) # (The example here is the bullseye release key)
#export ARCHIVE_EXTRA_KEYS="80D15823B7FD1561F9F7BCDDDC30D7C23CBBABEE" #export ARCHIVE_EXTRA_KEYS="1F89983E0081FDE018F3CC9673A4F27B8DD47936"
# By default we use debootstrap --no-check-gpg to find out the minimal set # By default we use debootstrap --no-check-gpg to find out the minimal set
# of packages because there's no reason to not trust the local mirror. But # of packages because there's no reason to not trust the local mirror. But

5
debian/changelog vendored
View File

@ -3,7 +3,6 @@ debian-cd (3.1.36) UNRELEASED; urgency=medium
[ Steve McIntyre ] [ Steve McIntyre ]
* Start bookworm development, copy the bullseye dirs to bookworm as * Start bookworm development, copy the bullseye dirs to bookworm as
a start a start
* Use $CODENAME/updates for security pre-bullseye, or * Use $CODENAME/updates for security pre-bullseye, or
$CODENAME-security for bullseye onwards. $CODENAME-security for bullseye onwards.
@ -19,6 +18,10 @@ debian-cd (3.1.36) UNRELEASED; urgency=medium
* data/bookworm: Use Debian Edu 12 installer logo and syslinux splash image * data/bookworm: Use Debian Edu 12 installer logo and syslinux splash image
from src:debian-edu-artwork 2.12.0.1-1 (showing version number 12). from src:debian-edu-artwork 2.12.0.1-1 (showing version number 12).
[ Daniel Lewart ]
* Update default CODENAME to bookworm in various places.
Closes: #994121
-- Steve McIntyre <93sam@debian.org> Mon, 26 Jul 2021 01:02:03 +0100 -- Steve McIntyre <93sam@debian.org> Mon, 26 Jul 2021 01:02:03 +0100
debian-cd (3.1.35) unstable; urgency=medium debian-cd (3.1.35) unstable; urgency=medium

4
easy-build.sh
View File

@ -72,10 +72,10 @@ fi
## For what release to build images ## For what release to build images
# The suite the installed system will be based on # The suite the installed system will be based on
export CODENAME=buster export CODENAME=bookworm
# The suite from which the udebs for the installer will be taken (normally # The suite from which the udebs for the installer will be taken (normally
# the same as CODENAME) # the same as CODENAME)
export DI_CODENAME=buster export DI_CODENAME=bookworm
## The debian-installer images to use. This must match the suite (DI_CODENAME) ## The debian-installer images to use. This must match the suite (DI_CODENAME)