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

merge MAXCDS patch from head

This commit is contained in:
Joey Hess 2004-07-02 19:28:54 +00:00
parent caa3db002f
commit 777b7aa815
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CONF.sh
View File

@ -41,7 +41,7 @@ unset BASE_INCLUDE || true
unset BASE_EXCLUDE || true unset BASE_EXCLUDE || true
unset INSTALLER_CD || true unset INSTALLER_CD || true
unset DI_CODENAME || true unset DI_CODENAME || true
unset MAXCDS || true
# The debian-cd dir # The debian-cd dir
# Where I am (hoping I'm in the debian-cd dir) # Where I am (hoping I'm in the debian-cd dir)
@ -265,3 +265,6 @@ export PUBLISH_PATH="/home/jigdo-area/"
# Parameters to pass to kernel when the CD boots. Not currently supported # Parameters to pass to kernel when the CD boots. Not currently supported
# for all architectures. # for all architectures.
#export KERNEL_PARAMS="DEBCONF_PRIORITY=critical" #export KERNEL_PARAMS="DEBCONF_PRIORITY=critical"
# If set, limits the number of binary CDs to produce.
#MAXCDS=1

8
tools/list2cds
View File

@ -23,6 +23,7 @@ my $complete = $ENV{'COMPLETE'} || 0;
my $exclude = "$list.exclude"; my $exclude = "$list.exclude";
my $norecommends = $ENV{'NORECOMMENDS'} || 0; my $norecommends = $ENV{'NORECOMMENDS'} || 0;
my $nosuggests = $ENV{'NOSUGGESTS'} || 1; my $nosuggests = $ENV{'NOSUGGESTS'} || 1;
my $maxcds = $ENV{'MAXCDS'} || 0;
my $apt = "$ENV{'BASEDIR'}/tools/apt-selection"; my $apt = "$ENV{'BASEDIR'}/tools/apt-selection";
my $adir = "$ENV{'APTTMP'}/$ENV{'CODENAME'}-$ENV{'ARCH'}"; my $adir = "$ENV{'APTTMP'}/$ENV{'CODENAME'}-$ENV{'ARCH'}";
@ -284,7 +285,14 @@ foreach (glob("$dir/*.packages")) {
} }
# Now write the lists down # Now write the lists down
my $numcds=0;
foreach (sort { $a <=> $b } keys %cds) { foreach (sort { $a <=> $b } keys %cds) {
if ($maxcds && $numcds+1 > $maxcds) {
msg(0, "Stopping at CD $numcds\n");
last;
}
$numcds++;
my $count = 0; my $count = 0;
open(CDLIST, "> $dir/$_.packages") open(CDLIST, "> $dir/$_.packages")
|| die "Can't write in $dir/$_.packages: $!\n"; || die "Can't write in $dir/$_.packages: $!\n";