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

Fix counting of images at build time 

Closes: #1063858
(cherry picked from commit 64c59791cf)
This commit is contained in:
Steve McIntyre 2024-02-15 01:42:12 +00:00
parent b52ec859d6
commit 884b7d8912
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -2,12 +2,12 @@ debian-cd (3.1.35+deb11u1) UNRELEASED; urgency=medium
[ Steve McIntyre ] [ Steve McIntyre ]
Backports from master for bullseye builds: Backports from master for bullseye builds:
* 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.
* Tweak grub boot menu highlight graphics to work again - switch * Tweak grub boot menu highlight graphics to work again - switch
from greyscale to colour, as newer grub has removed greyscale PNG from greyscale to colour, as newer grub has removed greyscale PNG
support.. Closes: #1013079, #1013432. support.. Closes: #1013079, #1013432.
* Fix counting of images at build time. Closes: #1063858
-- 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

4
tools/make_image
View File

@ -19,13 +19,11 @@ NUM_ARCHES=`echo $ARCHES | wc -w`
if [ "$CD"x = ""x ] ; then if [ "$CD"x = ""x ] ; then
echo "Generating the $ARCHES iso/jigdo images ..." echo "Generating the $ARCHES iso/jigdo images ..."
FILES=$DIR/*.volid
else else
echo "Generating $ARCHES iso/jigdo image number $CD ..." echo "Generating $ARCHES iso/jigdo image number $CD ..."
FILES=$DIR/$CD.volid
fi fi
NUM_CDS=`ls -1 $FILES | wc -l` NUM_CDS=$(ls -1 $DIR/*.volid | wc -l)
last_minute_update () { last_minute_update () {
echo " Last-minute updates:" echo " Last-minute updates:"