Hi,

I filed this as Bug#258026 but as per my other bug report,
Raphael asked me to discuss it here and work it into CVS if appropriate.

------

It would be nice if the debian installer could be sourced
from $LOCALDEBS if it and $LOCAL are set and the debian-installer
is present in that tree.

See attached patch

-- 
Horms
? .boot-i386.swp
Index: boot-i386
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/boot/sarge/boot-i386,v
retrieving revision 1.22
diff -u -r1.22 boot-i386
--- boot-i386   7 Jul 2004 03:31:05 -0000       1.22
+++ boot-i386   7 Jul 2004 08:12:15 -0000
@@ -55,7 +55,9 @@
     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"
@@ -112,7 +114,9 @@
     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"

Reply via email to