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

fix EXTRA_DISK_IMAGES handling

This commit is contained in:
Kenshi Muto 2004-09-18 14:58:10 +00:00
parent 4fd1458b03
commit 20c78d730b
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -17,6 +17,12 @@ debian-cd (2.2.20) UNRELEASED; urgency=low
- Bump m68k 2.4 kernels to 2.4.27.
* Petter Reinholdtsen
- New variable SPLASHPNG pointing to replacement splash image on i386.
* Kenshi Muto
- Fix cp routine around EXTRA_DISK_IMAGES in tools/boot/sarge/boot-i386
(add space to cp arguments)
- Add floppy/asian-root.img, floppy/mideast-root.img and
floppy/cyrillic-root.img to EXTRA_DISK_IMAGES (but may it be treated
as DISK_IMAGES?)
-- Joey Hess <joeyh@debian.org> Mon, 30 Aug 2004 15:23:19 -0400
@ -199,7 +205,7 @@ debian-cd (2.2.17) unstable; urgency=low
* Kenshi Muto
- Add jfbterm, unifont into forcd1, d-i+kernel (second stage of
debian-installer needs them).
- Add console-cyrillic, console-terminus, hotplug into forcd1,
- Add console-cyrillic, console-terminus, hotplug, iso-codes into forcd1,
d-i+kernel.
* Joey Hess
- Add "expert" mode to isolinux.cfg for sarge.

4
tools/boot/sarge/boot-i386
View File

@ -49,7 +49,7 @@ BOOT_IMAGES="cdrom/boot.img cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.t
DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img"
# Note that floppy/access/drivers.img was renamed to cd-drivers, both
# present for the transition.
EXTRA_DISK_IMAGES="floppy/net-drivers.img floppy/access/root.img floppy/access/boot.img floppy/access/cd-drivers.img floppy/access/drivers.img"
EXTRA_DISK_IMAGES="floppy/net-drivers.img floppy/access/root.img floppy/access/boot.img floppy/access/cd-drivers.img floppy/access/drivers.img floppy/asian-root.img floppy/cyrillic-root.img floppy/mideast-root.img"
# Download boot images and floppies.
for image in $BOOT_IMAGES $DISK_IMAGES; do
@ -70,7 +70,7 @@ for image in $EXTRA_DISK_IMAGES; do
dir=$(dirname $image)
mkdir -p $dir
if [ ! "$DI_WWW_HOME" ];then
cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image""$image" || true
cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image" "$image" || true
else
wget "$DI_WWW_HOME/$image" -O "$image" || rm -f "$image"
fi