Peppermint/debian-cd-clone
1
0
Fork 0
mirror of https://salsa.debian.org/images-team/debian-cd.git synced 2024-11-24 15:19:51 -01:00
Code Issues Packages Projects Releases Wiki Activity

Don't break on CD 2 onwards

Browse Source 
The $base_components file only matters on disc 1, so check it exists
before trying to do stuff with it.
This commit is contained in:
Steve McIntyre 2023-02-09 01:40:33 +00:00
parent d7796845f4
commit 80f7fa39ff
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/make_disc_trees.pl
View File

@ -901,10 +901,12 @@ sub finish_disc {
# Otherwise ensure not to pass --components=main,local to
# debootstrap:
my $base_components = ".disk/base_components";
my @components = read_file($base_components);
if (grep { $_ eq "local\n" } @components) {
print " Removing local from base_components (no such component under $codename)\n";
write_file($base_components, grep { $_ ne "local\n" } @components);
if (-f $base_components) {
my @components = read_file($base_components);
if (grep { $_ eq "local\n" } @components) {
print " Removing local from base_components (no such component under $codename)\n";
write_file($base_components, grep { $_ ne "local\n" } @components);
}
}
}