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

Update the boot-load-size parameter for all ElTorito booting arches

This commit is contained in:
Steve McIntyre 2012-08-13 13:06:04 +00:00
parent 4d8a88e5da
commit a37770b429
6 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -17,7 +17,8 @@ debian-cd (3.1.10) UNRELEASED; urgency=low
* Tweak powerpc boot options, using 32/64 bit detection in yaboot at
boot time. Thanks to Milan Kupcevic for the patch. Closes: #678066
* Tweak boot-load-size for ia64 to make CDs boot again. Closes: #678883.
Thanks to Stephan Schreiber for the patch.
Thanks to Stephan Schreiber for the patch. Tweak all the other
ElTorito-booting arches in a similar fashion.
[ Joey Hess ]
* Clean up forcd1, removing twm, wmaker, wmakerconf, pump,

4
tools/boot/wheezy/boot-hurd
View File

@ -69,7 +69,9 @@ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-b boot/grub/grub_eltorito"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c boot/boot.cat"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-emul-boot"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-load-size 4"
bls=$(calc_boot_size "boot$N/boot/grub/grub_eltorito")
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-load-size $bls"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-info-table"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"

4
tools/boot/wheezy/boot-ia64
View File

@ -51,13 +51,13 @@ install_languages $CDDIR
mkdir -p boot$N/boot
cp -f boot.img boot$N/boot/
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-emul-boot"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-b boot/boot.img"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c boot/boot.catalog"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-load-size $[($(stat -c%s "boot$N/boot/boot.img")+2047)/2048]"
bls=$(calc_boot_size "boot$N/boot/boot.img")
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-load-size $bls"
add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
# done

4
tools/boot/wheezy/boot-kfreebsd
View File

@ -81,7 +81,9 @@ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-b boot/grub/grub_eltorito"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c boot/boot.cat"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-emul-boot"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-load-size 4"
bls=$(calc_boot_size "boot$N/boot/grub/grub_eltorito")
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-load-size $bls"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-info-table"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"

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

@ -200,7 +200,9 @@ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-b isolinux/isolinux.bin"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c isolinux/boot.cat"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-emul-boot"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-load-size 4"
bls=$(calc_boot_size "boot$N/isolinux/isolinux.bin")
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-load-size $bls"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-info-table"
add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"

7
tools/boot/wheezy/common.sh
View File

@ -69,3 +69,10 @@ find_pkg_file() {
echo $pkgfile
}
# Work out the right boot load size for a specified file
calc_boot_size() {
FILE=$1
size=$[($(stat -c%s "$FILE")+2047)/2048]
echo $size
}