Cope with changes to d-i daily-build mirroring

This commit is contained in:
Steve McIntyre 2009-04-07 23:31:03 +00:00
parent 2c0136b79f
commit 799a06f4c2
11 changed files with 21 additions and 21 deletions

View File

@ -28,7 +28,7 @@ BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/alpha/daily/cdrom/"
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
DI_WWW_HOME=""
fi
fi

View File

@ -19,8 +19,8 @@ INSTALLDIR=$CDDIR/install
if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://people.debian.org/~kmuto/d-i/images/daily"
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
DI_WWW_HOME=""
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
DI_WWW_HOME=""
fi
fi
if [ ! "$DI_DIST" ]; then

View File

@ -14,11 +14,11 @@ set -e
N=$1
CDROOT=$2
if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/hppa/daily/cdrom/2.6"
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
DI_WWW_HOME=""
fi
DI_WWW_HOME="http://d-i.debian.org/daily-images/hppa/daily/cdrom/2.6"
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
DI_WWW_HOME=""
fi
fi
if [ ! "$DI_DIST" ]; then
DI_DIST="$DI_CODENAME"

View File

@ -15,7 +15,7 @@ BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://people.debian.org/~dannf/d-i/ia64/daily"
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
DI_WWW_HOME=""
fi
fi

View File

@ -18,8 +18,8 @@ if [ "$DI_WWW_HOME" = "default" ];then
# Temporarily disabled to stop cron jobs complaining
# DI_WWW_HOME="http://people.debian.org/~smarenka/d-i/m68k/images/daily/"
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
DI_WWW_HOME=""
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
DI_WWW_HOME=""
fi
elif [ "$DI_WWW_HOME" = "test" ];then
# Temporarily disabled to stop cron jobs complaining

View File

@ -16,8 +16,8 @@ CDROOT=$2
if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/mips/daily/"
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
DI_WWW_HOME=""
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
DI_WWW_HOME=""
fi
fi
if [ ! "$DI_DIST" ]; then

View File

@ -18,8 +18,8 @@ CDROOT=$2
if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/mipsel/daily/decstation/cdrom/"
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
DI_WWW_HOME=""
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
DI_WWW_HOME=""
fi
fi
if [ ! "$DI_DIST" ]; then

View File

@ -17,8 +17,8 @@ INSTALLDIR=$CDDIR/install
if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://people.debian.org/~wouter/d-i/powerpc/daily"
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
DI_WWW_HOME=""
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
DI_WWW_HOME=""
fi
fi
if [ ! "$DI_DIST" ]; then

View File

@ -32,7 +32,7 @@ fi
if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="https://lophos.multibuild.org/d-i/images/daily"
if [ -n "$DI_DIR" -a -e "$DI_DIR/~${DI_WWW_HOME#*~}" ] ; then
DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
DI_WWW_HOME=""
fi
fi

View File

@ -13,8 +13,8 @@ CDDIR=$2
if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://people.debian.org/~stappers/d-i/sparc/daily/cdrom"
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
DI_WWW_HOME=""
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
DI_WWW_HOME=""
fi
fi
if [ ! "$DI_DIST" ]; then

View File

@ -22,7 +22,7 @@ if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/amd64/daily"
fi
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
DI_WWW_HOME=""
echo "Using images from $DI_DIR"
fi