From 83af20b93f789fb265a17060220fb28d8ca8af3b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 29 Aug 2006 14:09:19 +0000 Subject: [PATCH] cope with powerpc cdrom -> cdrom64 change --- tools/boot/etch/boot-powerpc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/boot/etch/boot-powerpc b/tools/boot/etch/boot-powerpc index a1bf7031..ae8be6e8 100755 --- a/tools/boot/etch/boot-powerpc +++ b/tools/boot/etch/boot-powerpc @@ -94,9 +94,13 @@ do if [ ! "$DI_DIR" ];then DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images" fi - cp -a "$DI_DIR/$subarch/cdrom${bitness}" "$subarch" + if ! cp -a "$DI_DIR/$subarch/cdrom" "$subarch" && [ "$bitness" ]; then + cp -a "$DI_DIR/$subarch/cdrom${bitness}" "$subarch" + fi else - wget -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom${bitness}/" + if ! wget -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom/" && [ "$bitness" ]; then + wget -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom${bitness}/" + fi fi done