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

Also print out any trailing kernel entries

This commit is contained in:
Steve McIntyre 2012-12-29 03:52:48 +00:00
parent d658a59cc1
commit d51ba39a32
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CONF.sh
View File

@ -41,7 +41,7 @@ unset UDEB_INCLUDE || true
unset UDEB_EXCLUDE || true unset UDEB_EXCLUDE || true
unset BASE_INCLUDE || true unset BASE_INCLUDE || true
unset BASE_EXCLUDE || true unset BASE_EXCLUDE || true
unset INSTALLER_CD || true #unset INSTALLER_CD || true
unset MAXCDS || true unset MAXCDS || true
unset MAXISOS || true unset MAXISOS || true
unset MAXJIGDOS || true unset MAXJIGDOS || true
@ -136,12 +136,12 @@ export CONTRIB=1
# If you have a $MIRROR/dists/$CODENAME/local/binary-$ARCH dir with # If you have a $MIRROR/dists/$CODENAME/local/binary-$ARCH dir with
# local packages that you want to put on the CD set then # local packages that you want to put on the CD set then
# uncomment the following line # uncomment the following line
# export LOCAL=1 export LOCAL=1
# If your local packages are not under $MIRROR, but somewhere else, # If your local packages are not under $MIRROR, but somewhere else,
# you can uncomment this line and edit to to point to a directory # you can uncomment this line and edit to to point to a directory
# containing dists/$CODENAME/local/binary-$ARCH # containing dists/$CODENAME/local/binary-$ARCH
# export LOCALDEBS=/home/joey/debian/va/debian export LOCALDEBS=/mirror/debian-local
# Where to find the security patches. This directory should be the # Where to find the security patches. This directory should be the
# top directory of a security.debian.org mirror. # top directory of a security.debian.org mirror.
@ -168,6 +168,8 @@ export CONTRIB=1
# export MKISOFS=mkisofs # export MKISOFS=mkisofs
# export MKISOFS_OPTS="-r" #For normal users # export MKISOFS_OPTS="-r" #For normal users
# export MKISOFS_OPTS="-r -F ." #For symlink farmers # export MKISOFS_OPTS="-r -F ." #For symlink farmers
export MKISOFS="/home/steve/bin/xorriso"
export MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1,sha256,sha512"
# Override for i386 and amd64 to use xorriso instead of # Override for i386 and amd64 to use xorriso instead of
# mkisofs/genisoimage. Allows creation of isohybrid images: ISO images # mkisofs/genisoimage. Allows creation of isohybrid images: ISO images
@ -209,7 +211,7 @@ ATTEMPT_FALLBACK=yes
# STICK4GB: 4GB USB stick or similar # STICK4GB: 4GB USB stick or similar
# STICK8GB: 8GB USB stick or similar # STICK8GB: 8GB 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=NETINST
#export DISKTYPE=CUSTOM #export DISKTYPE=CUSTOM
#export CUSTOMSIZE=XXXX #export CUSTOMSIZE=XXXX
# If you want to over-ride this choice (e.g. to make a larger version of a given disk), # If you want to over-ride this choice (e.g. to make a larger version of a given disk),
@ -230,7 +232,7 @@ export VARIANTS=
# Set this if the recommended packages should be skipped when adding # Set this if the recommended packages should be skipped when adding
# package on the CD. The default is 'true'. # package on the CD. The default is 'true'.
# export NORECOMMENDS=1 export NORECOMMENDS=0
# Set this if the suggested packages should be skipped when adding # Set this if the suggested packages should be skipped when adding
# package on the CD. The default is 'true'. # package on the CD. The default is 'true'.

5
tools/boot/wheezy/parse_isolinux
View File

@ -191,4 +191,7 @@ foreach my $line(@lines) {
#print "$line\n"; #print "$line\n";
} }
} }
if ($in_kernel) {
print_kernel(\%kernel);
undef %kernel;
}