[ Petter Reinholdtsen ]

* Update tools/boot/*/boot-amd64 to use the correct isolinux
    splash image settings, and to insert $KERNEL_PARAMS correctly into
    isolinux.cfg.  Based on patches already implemented in boot-i386.
This commit is contained in:
Petter Reinholdtsen 2006-10-15 16:44:41 +00:00
parent 11cc7d189a
commit 99ca059cfa
3 changed files with 14 additions and 5 deletions

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
debian-cd (2.2.26) UNRELEASED; urgency=low
[ Petter Reinholdtsen ]
* Update tools/boot/*/boot-amd64 to use the correct isolinux
splash image settings, and to insert $KERNEL_PARAMS correctly into
isolinux.cfg. Based on patches already implemented in boot-i386.
-- Petter Reinholdtsen <pere@debian.org> Sun, 15 Oct 2006 18:40:18 +0200
debian-cd (2.2.25) unstable; urgency=low
[ Joey Hess ]

View File

@ -118,17 +118,17 @@ fi
rm -f boot$N/isolinux/isolinux.cfg.with* 2>/dev/null || true
if [ "$SPLASHPNG" ] ; then
# Insert our own splash screen. Color index 15 is
# 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=15" > boot$N/isolinux/splash.rle
ppmtolss16 "#ffffff=7" "#000000=0" > boot$N/isolinux/splash.rle
fi
if [ -n "$KERNEL_PARAMS" ]; then
# Substitute custom kernel params into the isolinux config
# file.
sed -i "s|append |append $KERNEL_PARAMS|" boot$N/isolinux/isolinux.cfg
sed -i "s|append |append $KERNEL_PARAMS |" boot$N/isolinux/isolinux.cfg
fi
# Add autorun if we have README.html

View File

@ -104,11 +104,11 @@ if [ -e boot$N/isolinux/f3.txt.only26 ];then
mv boot$N/isolinux/f3.txt.only26 boot$N/isolinux/f3.txt
fi
if [ "$SPLASHPNG" ] ; then
# Insert our own splash screen. Color index 15 is
# 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=15" > boot$N/isolinux/splash.rle
ppmtolss16 "#ffffff=7" "#000000=0" > boot$N/isolinux/splash.rle
fi
# write final lines to mkisofs_opts