* Add support to boot/etch/boot-i386 for adding gtk images. If the
isolinux files include .with26+gtk, include gtk initrd along with the 2.4 kernel. If .withgtk, include gtk initrd along with the default (presumably 2.6) kernel. untested!!
This commit is contained in:
parent
42f5f35980
commit
cbd40e680e
|
@ -33,8 +33,12 @@ debian-cd (2.2.25) UNRELEASED; urgency=low
|
|||
[ Joey Hess ]
|
||||
* ths has taken over mipsel builds
|
||||
* Add sudo to generate_di+k_list, it's needed for installs w/o a root user.
|
||||
* Add support to boot/etch/boot-i386 for adding gtk images. If the
|
||||
isolinux files include .with26+gtk, include gtk initrd along with the
|
||||
2.4 kernel. If .withgtk, include gtk initrd along with the default
|
||||
(presumably 2.6) kernel.
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Fri, 12 May 2006 00:53:25 -0500
|
||||
-- Joey Hess <joeyh@debian.org> Sun, 14 May 2006 12:25:58 -0500
|
||||
|
||||
debian-cd (2.2.24) unstable; urgency=low
|
||||
|
||||
|
|
|
@ -112,6 +112,35 @@ else
|
|||
fi
|
||||
fi
|
||||
|
||||
syslinux_files () {
|
||||
type=$1
|
||||
|
||||
mv boot$N/isolinux/f3.txt.$type boot$N/isolinux/f3.txt
|
||||
mv boot$N/isolinux/f4.txt.$type boot$N/isolinux/f4.txt
|
||||
mv boot$N/isolinux/isolinux.cfg.$type boot$N/isolinux/isolinux.cfg
|
||||
}
|
||||
|
||||
extra_image () {
|
||||
image=$1
|
||||
dir=$(dirname "$image")
|
||||
|
||||
if [ ! -e "cdrom/$image" ]; then
|
||||
mkdir -p $dir
|
||||
if [ ! "$DI_WWW_HOME" ];then
|
||||
if [ ! "$DI_DIR" ];then
|
||||
DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
|
||||
fi
|
||||
cp "$DI_DIR/cdrom/$image" "$image"
|
||||
else
|
||||
wget "$DI_WWW_HOME/cdrom/$image" -O "$image"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -d $CDDIR/install/$dir ]; then
|
||||
cp -a "$image" $CDDIR/install/$dir
|
||||
fi
|
||||
}
|
||||
|
||||
# Only disk one gets the extra files installed
|
||||
if [ "$NN" = "1" ]; then
|
||||
# populate the install directory as well
|
||||
|
@ -131,30 +160,20 @@ if [ "$NN" = "1" ]; then
|
|||
|
||||
# Isolinux setup including config and help files comes from d-i.
|
||||
cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux/; tar zx)
|
||||
# TODO: is using the .with26 file as a flag really the best way?
|
||||
if [ -e boot$N/isolinux/f3.txt.with26+gtk ]; then
|
||||
extra_image 2.6/initrd.gz
|
||||
extra_image 2.6/vmlinuz
|
||||
extra_image gtk/initrd.gz
|
||||
syslinux_files with26+gtk
|
||||
elif [ -e boot$N/isolinux/f3.txt.withgtk ]; then
|
||||
extra_image gtk/initrd.gz
|
||||
syslinux_files withgtk
|
||||
if [ -e boot$N/isolinux/f3.txt.with26 ];then
|
||||
mv boot$N/isolinux/f3.txt.with26 boot$N/isolinux/f3.txt
|
||||
for image in cdrom/2.6/initrd.gz cdrom/2.6/vmlinuz; do
|
||||
if [ ! -e "$image" ]; then
|
||||
dir=$(dirname $image)
|
||||
mkdir -p $dir
|
||||
if [ ! "$DI_WWW_HOME" ];then
|
||||
if [ ! "$DI_DIR" ];then
|
||||
DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
|
||||
fi
|
||||
cp "$DI_DIR/$image" "$image"
|
||||
else
|
||||
wget "$DI_WWW_HOME/$image" -O "$image"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
cp -a cdrom/2.6 $CDDIR/install/2.6
|
||||
mv boot$N/isolinux/isolinux.cfg.with26 boot$N/isolinux/isolinux.cfg
|
||||
extra_image 2.6/initrd.gz
|
||||
extra_image 2.6/vmlinuz
|
||||
syslinux_files with26
|
||||
else
|
||||
rm -f boot$N/isolinux/isolinux.cfg.with26
|
||||
fi
|
||||
if [ -e boot$N/isolinux/f4.txt.with26 ];then
|
||||
mv boot$N/isolinux/f4.txt.with26 boot$N/isolinux/f4.txt
|
||||
rm -f boot$N/isolinux/isolinux.cfg.with* 2>/dev/null || true
|
||||
fi
|
||||
|
||||
if [ "$SPLASHPNG" ] ; then
|
||||
|
|
Loading…
Reference in New Issue