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

make_disc_trees.pl: if files will not fit on media, fail loudly 

rather than sitting in a loop foreber. Fail properly in #1069682
This commit is contained in:
Steve McIntyre 2024-04-23 02:33:17 +01:00
parent 06abc37791
commit 44d0ff683f
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -10,6 +10,8 @@ debian-cd (3.2.2) UNRELEASED; urgency=medium
* Look for firmware in /usr/lib/firmware as well as /lib/firmware. * Look for firmware in /usr/lib/firmware as well as /lib/firmware.
Closes: #1059858 Closes: #1059858
* Fix counting of images at build time. Closes: #1063858 * Fix counting of images at build time. Closes: #1063858
* make_disc_trees.pl: if files will not fit on media, fail loudly
rather than sitting in a loop foreber. Fail properly in #1069682.
[ Guido Berhoerster ] [ Guido Berhoerster ]
* Update DebianEdu installer banner and syslinux splash image * Update DebianEdu installer banner and syslinux splash image

12
tools/make_disc_trees.pl
View File

@ -246,6 +246,10 @@ while (defined (my $pkg = <INLIST>)) {
if (($pkgname =~ /^\Q$entry\E$/m)) { if (($pkgname =~ /^\Q$entry\E$/m)) {
print LOG "Re-including $reinclude_pkg due to match on \"\^$entry\$\"\n"; print LOG "Re-including $reinclude_pkg due to match on \"\^$entry\$\"\n";
$guess_size = int($hfs_mult * add_packages($cddir, $reinclude_pkg)); $guess_size = int($hfs_mult * add_packages($cddir, $reinclude_pkg));
if ($guess_size > $maxdiskblocks) {
print LOG "$reinclude_pkg will never fit - it is $guess_size blocks against a disk size of $maxdiskblocks. ABORT\n";
die "$reinclude_pkg will never fit - it is $guess_size blocks against a disk size of $maxdiskblocks. ABORT\n";
}
$size += $guess_size; $size += $guess_size;
print LOG "CD $disknum: GUESS_TOTAL is $size after adding $reinclude_pkg\n"; print LOG "CD $disknum: GUESS_TOTAL is $size after adding $reinclude_pkg\n";
$pkgs_this_cd++; $pkgs_this_cd++;
@ -259,6 +263,10 @@ while (defined (my $pkg = <INLIST>)) {
my $overflowpkg = pop @overflowlist; my $overflowpkg = pop @overflowlist;
print LOG "Adding a package that failed on the last disc: $overflowpkg\n"; print LOG "Adding a package that failed on the last disc: $overflowpkg\n";
$guess_size = int($hfs_mult * add_packages($cddir, $overflowpkg)); $guess_size = int($hfs_mult * add_packages($cddir, $overflowpkg));
if ($guess_size > $maxdiskblocks) {
print LOG "$overflowpkg will never fit - it is $guess_size blocks against a disk size of $maxdiskblocks. ABORT\n";
die "$overflowpkg will never fit - it is $guess_size blocks against a disk size of $maxdiskblocks. ABORT\n";
}
$size += $guess_size; $size += $guess_size;
print LOG "CD $disknum: GUESS_TOTAL is $size after adding $overflowpkg\n"; print LOG "CD $disknum: GUESS_TOTAL is $size after adding $overflowpkg\n";
$pkgs_this_cd++; $pkgs_this_cd++;
@ -281,6 +289,10 @@ while (defined (my $pkg = <INLIST>)) {
} else { } else {
$guess_size = int($hfs_mult * add_packages($cddir, $pkg)); $guess_size = int($hfs_mult * add_packages($cddir, $pkg));
$size += $guess_size; $size += $guess_size;
if ($guess_size > $maxdiskblocks) {
print LOG "$pkg will never fit - it is $guess_size blocks against a disk size of $maxdiskblocks. ABORT\n";
die "$pkg will never fit - it is $guess_size blocks against a disk size of $maxdiskblocks. ABORT\n";
}
push (@pkgs_added, $pkg); push (@pkgs_added, $pkg);
print LOG "CD $disknum: GUESS_TOTAL is $size after adding $pkg\n"; print LOG "CD $disknum: GUESS_TOTAL is $size after adding $pkg\n";
if (($size > $maxdiskblocks) || if (($size > $maxdiskblocks) ||