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

- Apply patch from bug #258026.

This commit is contained in:
Raphaël Hertzog 2005-01-12 16:38:17 +00:00
parent 293e3bf557
commit b01a2e73ba
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -9,6 +9,8 @@ debian-cd (2.2.21) UNRELEASED; urgency=low
and I need more people involved in managing bugs.
- Apply patch from Horms <horms@debian.org> to fix some problems with
inclusion of local udebs. Closes: #258029
- Apply another patch from horsm@debian.org to try to look for d-i images
in "local" dirs first. Closes: #258026
* Joey Hess
- Exclude all the new amd64 kernel images from cd #1, no space.
- Forgot to exclude old kernel-image-2.6.7-1-686-smp from cd #1.
@ -76,7 +78,7 @@ debian-cd (2.2.21) UNRELEASED; urgency=low
libgpg-error0, libtasn1-2: new libraries
- console-tools: now installed by debootstrap even on s390
-- Raphael Hertzog <hertzog@debian.org> Wed, 12 Jan 2005 17:07:56 +0100
-- Raphael Hertzog <hertzog@debian.org> Wed, 12 Jan 2005 17:35:52 +0100
debian-cd (2.2.20) unstable; urgency=medium

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

@ -59,7 +59,9 @@ for image in $BOOT_IMAGES $DISK_IMAGES; do
if [ ! -e "$image" ]; then
dir=$(dirname $image)
mkdir -p $dir
if [ ! "$DI_WWW_HOME" ];then
if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$image"
elif [ ! "$DI_WWW_HOME" ];then
cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image" "$image"
else
wget "$DI_WWW_HOME/$image" -O "$image"
@ -72,7 +74,9 @@ for image in $EXTRA_DISK_IMAGES; do
if [ ! -e "$image" ]; then
dir=$(dirname $image)
mkdir -p $dir
if [ ! "$DI_WWW_HOME" ];then
if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$image"
elif [ ! "$DI_WWW_HOME" ];then
cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image" "$image" || true
else
wget "$DI_WWW_HOME/$image" -O "$image" || rm -f "$image"