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

Add explicit support got 16G USB images

This commit is contained in:
Steve McIntyre 2019-06-17 01:40:25 +01:00
parent e1e87148a1
commit 114e8a3e55
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONF.sh
View File

@ -236,6 +236,7 @@ ATTEMPT_FALLBACK=yes
# STICK2GB: 2GB USB stick or similar # STICK2GB: 2GB USB stick or similar
# STICK4GB: 4GB USB stick or similar # STICK4GB: 4GB USB stick or similar
# STICK8GB: 8GB USB stick or similar # STICK8GB: 8GB USB stick or similar
# STICK16GB: 16GB USB stick or similar
# CUSTOM: up to you - specify a size to go with it (in 2K blocks) # CUSTOM: up to you - specify a size to go with it (in 2K blocks)
export DISKTYPE=CD export DISKTYPE=CD
#export DISKTYPE=CUSTOM #export DISKTYPE=CUSTOM

1
debian/changelog vendored
View File

@ -23,6 +23,7 @@ debian-cd (3.1.24) UNRELEASED; urgency=medium
jigdo files, to reduce load on the service. jigdo files, to reduce load on the service.
* Don't include -686-pae udebs on media - we may not have a kernel * Don't include -686-pae udebs on media - we may not have a kernel
to use with them anyway to use with them anyway
* Add explicit support for 16G USB sticks
-- Holger Levsen <holger@debian.org> Wed, 20 Feb 2019 14:12:16 +0100 -- Holger Levsen <holger@debian.org> Wed, 20 Feb 2019 14:12:16 +0100

3
tools/make_disc_trees.pl
View File

@ -769,6 +769,9 @@ sub get_disc_size {
} elsif ($chosen_disk eq "STICK8GB") { } elsif ($chosen_disk eq "STICK8GB") {
$maxdiskblocks = int(8 * $GB / $blocksize) - $reserved; $maxdiskblocks = int(8 * $GB / $blocksize) - $reserved;
$diskdesc = "8GB STICK"; $diskdesc = "8GB STICK";
} elsif ($chosen_disk eq "STICK16GB") {
$maxdiskblocks = int(16 * $GB / $blocksize) - $reserved;
$diskdesc = "16GB STICK";
} elsif ($chosen_disk eq "CUSTOM") { } elsif ($chosen_disk eq "CUSTOM") {
$maxdiskblocks = $ENV{'CUSTOMSIZE'} - $reserved || $maxdiskblocks = $ENV{'CUSTOMSIZE'} - $reserved ||
die "Need to specify a custom size for the CUSTOM disktype\n"; die "Need to specify a custom size for the CUSTOM disktype\n";