From 3adf94038b8d490d2f021605c7962490873bbe61 Mon Sep 17 00:00:00 2001 From: Sven Luther Date: Tue, 20 Sep 2005 17:26:10 +0000 Subject: [PATCH] Readded the bitness thingy, which got lost before i had svn access. --- tools/boot/etch/boot-powerpc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/boot/etch/boot-powerpc b/tools/boot/etch/boot-powerpc index a56d215e..747d619b 100755 --- a/tools/boot/etch/boot-powerpc +++ b/tools/boot/etch/boot-powerpc @@ -17,11 +17,7 @@ INSTALLDIR=$CDDIR/install if [ "$DI_WWW_HOME" = "default" ];then DI_WWW_HOME="http://people.debian.org/~luther/d-i/images/daily" if [ -n "$DI_DIR" ];then - if [ ! -d "$DI_DIR" ];then - DI_DIR="/org/gluck.debian.org/chroot/sid/home/luther/public_html/d-i/images/daily" - else - DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}" - fi + DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}" DI_WWW_HOME="" fi fi @@ -95,13 +91,14 @@ cp $BASEDIR/data/etch/yaboot/ofboot.b ofboot.b for subarch in powerpc powerpc64 do + bitness=${subarch#powerpc} if [ ! "$DI_WWW_HOME" ];then if [ ! "$DI_DIR" ];then DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images" fi - cp -a "$DI_DIR/$subarch/cdrom" "$subarch" + cp -a "$DI_DIR/$subarch/cdrom${bitness}" "$subarch" else - wget -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom/" + wget -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom${bitness}/" fi done