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

only add a partition offset if we don't have grub files

This commit is contained in:
Steve McIntyre 2013-01-15 01:32:39 +00:00
parent 5cb7afe1f2
commit f299e200d7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,7 +201,6 @@ echo $SYSLINUXDEB >> $CDDIR/../$N.pkgs_extracted
find_pkg_file syslinux source >> $CDDIR/../$N.pkgs_extracted find_pkg_file syslinux source >> $CDDIR/../$N.pkgs_extracted
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-isohybrid-mbr syslinux/usr/lib/syslinux/isohdpfx.bin" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-isohybrid-mbr syslinux/usr/lib/syslinux/isohdpfx.bin"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-partition_offset 16"
# In case of a multi-arch CD the script will be called two times. The # In case of a multi-arch CD the script will be called two times. The
# first time the isolinux dir gets set up for single arch; if it is # first time the isolinux dir gets set up for single arch; if it is
@ -219,6 +218,12 @@ mkdir -p boot$N/isolinux
# Isolinux setup including config and help files comes from d-i. # Isolinux setup including config and help files comes from d-i.
cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux/; tar zx) cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux/; tar zx)
# If we don't have grub stuff from d-i, tell xorriso to add a
# partition offset for the isohybrid code
if [ ! -d boot$N/isolinux/grub ] ; then
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-partition_offset 16"
fi
di_syslinux_ver="$(di_syslinux_version)" di_syslinux_ver="$(di_syslinux_version)"
case "$di_syslinux_ver" in case "$di_syslinux_ver" in
2.0) 2.0)