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

Be more explicit if DISKTYPE is not specified, or unrecognised

This commit is contained in:
Steve McIntyre 2021-01-16 22:32:48 +00:00
parent 34b8379db4
commit 966016c495
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/make_disc_trees.pl
View File

@ -54,6 +54,11 @@ if ($backports_list =~ /^$/) {
$backports = 0;;
}
my $disktype = read_env('DISKTYPE', "");
if ($disktype =~ /^$/) {
die "make_disc_trees.pl: DISKTYPE not set, aborting\n";
}
# MAXCDS is the hard limit on the MAXIMUM number of images to
# make. MAXJIGDOS and MAXISOS can only make this number smaller; we
# will use the higher of those 2 numbers as the last image to go to,
@ -123,7 +128,6 @@ my $blocksize = 2048;
my ($maxdiskblocks, $diskdesc);
my $cddir;
my $disktype = $ENV{'DISKTYPE'};
my $size_swap_check;
my $hfs_extra = 0;
my $hfs_mult = 1;
@ -766,6 +770,8 @@ sub get_disc_size {
$maxdiskblocks = $ENV{'CUSTOMSIZE'} - $reserved ||
die "Need to specify a custom size for the CUSTOM disktype\n";
$diskdesc = "User-supplied size";
} else {
die "make_disc_trees.pl: Unknown disk type \"$chosen_disk\" specified; ABORT\n";
}
$ENV{'MAXDISKBLOCKS'} = $maxdiskblocks;