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

Depending on the version of xorriso we have, use different EFI command line options

This commit is contained in:
Steve McIntyre 2013-01-15 01:51:51 +00:00
parent f299e200d7
commit 5d2db49de9
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
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
@ -70,7 +70,8 @@ fi
# This may be an url, or "default", which will make it use the default url # This may be an url, or "default", which will make it use the default url
# for the daily d-i builds. If not set, uses the official d-i images from # for the daily d-i builds. If not set, uses the official d-i images from
# the Debian mirror. # the Debian mirror.
#export DI_WWW_HOME=default export DI_WWW_HOME=default
export DI_DIR=/home/steve/debian/debian-cd/
# Version number, "2.2 r0", "2.2 r1" etc. # Version number, "2.2 r0", "2.2 r1" etc.
export DEBVERSION="7.0" export DEBVERSION="7.0"
@ -136,12 +137,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 +169,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 +212,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 +233,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'.

11
tools/boot/wheezy/boot-x86
View File

@ -454,14 +454,23 @@ if [ -d boot$N/isolinux/grub ] ; then
mcopy -i "$CDDIR/boot/grub/efi.img" $CDDIR/efi/boot/boot*.efi \ mcopy -i "$CDDIR/boot/grub/efi.img" $CDDIR/efi/boot/boot*.efi \
"::efi/boot" "::efi/boot"
# Ugh - different code here depending on the version of xorriso we've got
if [ $XORRISO_VER -le 10202 ] ; then
# 1.2.2 shipping in Wheezy
echo "Using older EFI command line for xorriso $XORRISO_VER"
# Tell xorriso to create a secondary ElTorito boot record for the # Tell xorriso to create a secondary ElTorito boot record for the
# EFI bootloader # EFI bootloader
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-eltorito-alt-boot --efi-boot boot/grub/efi.img" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-eltorito-alt-boot --efi-boot boot/grub/efi.img"
# Add the efi image as a FAT partition too, so our CD image will # Add the efi image as a FAT partition too, so our CD image will
# also boot on a USB key (like isohybrid, just implemented # also boot on a USB key (like isohybrid, just implemented
# differently) # differently)
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-append_partition 2 0x01 $CDDIR/boot/grub/efi.img" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-append_partition 2 0x01 $CDDIR/boot/grub/efi.img"
elif [ $XORRISO_VER -gt 10202 ] ; then
echo "Using newer EFI support in xorriso $XORRISO_VER"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-isohybrid-gpt-basdat -isohybrid-apm-hfsplus"
fi
else else
echo " No EFI boot code for $ARCH on CD$N" echo " No EFI boot code for $ARCH on CD$N"
fi fi