New variable SPLASHPNG pointing to replacement splash image on i386.
This commit is contained in:
parent
33f78455f0
commit
f270a74ade
6
CONF.sh
6
CONF.sh
|
@ -42,6 +42,7 @@ unset BASE_EXCLUDE || true
|
||||||
unset INSTALLER_CD || true
|
unset INSTALLER_CD || true
|
||||||
unset DI_CODENAME || true
|
unset DI_CODENAME || true
|
||||||
unset MAXCDS || true
|
unset MAXCDS || true
|
||||||
|
unset SPLASHPNG || true
|
||||||
|
|
||||||
# The debian-cd dir
|
# The debian-cd dir
|
||||||
# Where I am (hoping I'm in the debian-cd dir)
|
# Where I am (hoping I'm in the debian-cd dir)
|
||||||
|
@ -267,4 +268,7 @@ export PUBLISH_PATH="/home/jigdo-area/"
|
||||||
#export KERNEL_PARAMS="DEBCONF_PRIORITY=critical"
|
#export KERNEL_PARAMS="DEBCONF_PRIORITY=critical"
|
||||||
|
|
||||||
# If set, limits the number of binary CDs to produce.
|
# If set, limits the number of binary CDs to produce.
|
||||||
#MAXCDS=1
|
#export MAXCDS=1
|
||||||
|
|
||||||
|
# If set, overrides the boot picture used.
|
||||||
|
#export SPLASHPNG="$BASEDIR/data/$CODENAME/splash-img.png"
|
||||||
|
|
|
@ -30,6 +30,8 @@ unset PUBLISH_NONUS_URL || true
|
||||||
unset PUBLISH_PATH || true
|
unset PUBLISH_PATH || true
|
||||||
unset INSTALLER_CD || true
|
unset INSTALLER_CD || true
|
||||||
unset DI_CODENAME || true
|
unset DI_CODENAME || true
|
||||||
|
unset MAXCDS || true
|
||||||
|
unset SPLASHPNG || true
|
||||||
|
|
||||||
|
|
||||||
# The debian-cd dir
|
# The debian-cd dir
|
||||||
|
@ -220,3 +222,13 @@ export PUBLISH_PATH="/home/jigdo-area/"
|
||||||
# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer)
|
# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer)
|
||||||
# INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel)
|
# INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel)
|
||||||
#export INSTALLER_CD=0
|
#export INSTALLER_CD=0
|
||||||
|
|
||||||
|
# Parameters to pass to kernel when the CD boots. Not currently supported
|
||||||
|
# for all architectures.
|
||||||
|
#export KERNEL_PARAMS="DEBCONF_PRIORITY=critical"
|
||||||
|
|
||||||
|
# If set, limits the number of binary CDs to produce.
|
||||||
|
#export MAXCDS=1
|
||||||
|
|
||||||
|
# If set, overrides the boot picture used.
|
||||||
|
#export SPLASHPNG="$BASEDIR/data/$CODENAME/splash-img.png"
|
||||||
|
|
|
@ -72,6 +72,7 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
|
||||||
possible to use debian-installer with Woody CDs.
|
possible to use debian-installer with Woody CDs.
|
||||||
- Avoid illegal dash (-) in cpp architecture defines. Patch
|
- Avoid illegal dash (-) in cpp architecture defines. Patch
|
||||||
from Colin Watson.
|
from Colin Watson.
|
||||||
|
- New variable SPLASHPNG pointing to replacement splash image on i386.
|
||||||
* Stephen R. Marenka
|
* Stephen R. Marenka
|
||||||
- Update m68k support for sarge.
|
- Update m68k support for sarge.
|
||||||
- Fix m68k/amiga icons.
|
- Fix m68k/amiga icons.
|
||||||
|
|
|
@ -120,6 +120,14 @@ if [ -e boot$N/isolinux/f3.txt.with26 ];then
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
cp -a cdrom/2.6 $CDDIR/install/2.6
|
cp -a cdrom/2.6 $CDDIR/install/2.6
|
||||||
|
|
||||||
|
if [ "$SPLASHPNG" ] ; then
|
||||||
|
# Insert our own splash screen. Color index 15 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
|
||||||
|
fi
|
||||||
|
|
||||||
# Isolinux config file.
|
# Isolinux config file.
|
||||||
cat > boot$N/isolinux/isolinux.cfg <<EOF
|
cat > boot$N/isolinux/isolinux.cfg <<EOF
|
||||||
DEFAULT /install/vmlinuz APPEND $KERNEL_PARAMS vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
|
DEFAULT /install/vmlinuz APPEND $KERNEL_PARAMS vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
|
||||||
|
|
Loading…
Reference in New Issue