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

rearrange to make sure is set before we set

This commit is contained in:
Steve McIntyre 2006-12-20 11:02:59 +00:00
parent 4bb6ee2bbe
commit 74e9050525
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/make_disc_trees.pl
View File

@ -60,12 +60,6 @@ my $size_swap_check;
my $hfs_extra = 0;
my $hfs_mult = 1;
# Space calculation for extra HFS crap
if ($archlist =~ /m68k/ || $archlist =~ /powerpc/) {
$hfs_extra = int($maxdiskblocks * 8 / $blocksize);
$hfs_mult = 1.1;
}
# And count how many packages added since the last size check was done
# - the estimation code is getting very accurate, so let's reduce the
# number of times we fork mkisofs
@ -100,6 +94,12 @@ chdir $bdir;
$cddir = "$bdir/CD$disknum";
get_disc_size();
# Space calculation for extra HFS crap
if ($archlist =~ /m68k/ || $archlist =~ /powerpc/) {
$hfs_mult = 1.1;
$hfs_extra = int($maxdiskblocks * 8 / $blocksize);
}
print "Starting to lay out packages into $disktype ($diskdesc) images: $maxdiskblocks 2K-blocks maximum per image\n";
open(INLIST, "$bdir/packages") || die "No packages file!\n";