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

Finish refactoring, and make x86 CDs bootable again. Oops

This commit is contained in:
Steve McIntyre 2010-09-18 00:56:54 +00:00
parent a24fa2e1c5
commit 4a56e9cf12
1 changed files with 139 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tools/boot/squeeze/boot-x86
View File

@ -33,9 +33,9 @@ fi
cd $CDDIR/..
# This script is called with $1 (now $N) as the CD to
# make bootable. N may be in the form "n" or "n_NONUS"
# There may be more than 4 disks...support extras.
# This script is called with $1 (now $N) as the CD to make bootable.
# N may be in the form "n" or "n_NONUS" There may be more than 4
# disks...support extras.
# Strip NONUS part of disk number
# NN will be 1...N so it can be used as an index
@ -161,7 +161,6 @@ esac
# desktop boot parameter gets set separately through DESKTOP variable
KERNEL_PARAMS="$(echo "$KERNEL_PARAMS" | sed -r "s/desktop=[^ ]* ?//")"
if [ "$THISTYPE" = "isolinux" ]; then
echo " Using ISOLINUX boot-disks image on CD$N"
mkdir -p $CDDIR/$INSTALLDIR
cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/
@ -189,12 +188,11 @@ if [ "$THISTYPE" = "isolinux" ]; then
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-info-table"
add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
# 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 called a second time the isolinux dir already exists and we
# know it will be multi-arch. We then throw away the first version
# and just configure things from scratch for multi-arch.
# 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
# called a second time the isolinux dir already exists and we know it
# will be multi-arch. We then throw away the first version and just
# configure things from scratch for multi-arch.
MULTIARCH=
if [ -e boot$N/isolinux/isolinux.cfg ]; then
@ -291,9 +289,8 @@ if [ "$THISTYPE" = "isolinux" ]; then
fi
if [ "$SPLASHPNG" ] ; then
# Insert our own splash screen. Color index 0 is
# background, and index 7 is foreground. Set to black and
# white respecively
# Insert our own splash screen. Color index 0 is background, and
# index 7 is foreground. Set to black and white respecively
pngtopnm < $SPLASHPNG | ppmquant 16 | \
ppmtolss16 "#ffffff=7" "#000000=0" > boot$N/isolinux/splash.rle
pngtopnm < $SPLASHPNG | ppmquant 16 | pnmtopng > boot$N/isolinux/splash.png
@ -302,8 +299,7 @@ if [ "$THISTYPE" = "isolinux" ]; then
sed -i "s|built on|built $BUILD_DATE; d-i|" boot$N/isolinux/f1.txt
if [ -n "$KERNEL_PARAMS" ]; then
# Substitute custom kernel params into the isolinux config
# file(s)
# Substitute custom kernel params into the isolinux config file(s)
for file in boot$N/isolinux/*.cfg boot$N/isolinux/desktop/*.cfg; do
case "$(basename $file)" in
instsel.cfg)
@ -322,23 +318,6 @@ if [ "$THISTYPE" = "isolinux" ]; then
*)
modify_for_single_desktop ;;
esac
else
if [ -n "$THISTYPE" ]; then
echo "Using $THISTYPE boot-disks image on CD$N"
mkdir -p boot$N/boot
cp $THISTYPE/boot.img boot$N/boot/
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
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_dirs "boot$N"
else
mkdir -p boot$N
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
fi
fi
# Add autorun
if [ -f boot$N/setup.exe ]; then