second half of sven's patch

This commit is contained in:
Joey Hess 2005-09-17 17:05:27 +00:00
parent 962e4c37b5
commit 46f282657d
1 changed files with 1 additions and 10 deletions

View File

@ -35,7 +35,7 @@ fi
install_languages $CDDIR install_languages $CDDIR
echo -n "--chrp-boot --netatalk -hfs -probe -map $BASEDIR/data/hfs.map" \ echo -n " --iso-level 2 --chrp-boot --netatalk -hfs -probe -map $BASEDIR/data/hfs.map" \
> $N.mkisofs_opts > $N.mkisofs_opts
# We are still missing this for prep # We are still missing this for prep
echo -n " -prep-boot install/powerpc/vmlinuz-prep.initrd" >> $N.mkisofs_opts echo -n " -prep-boot install/powerpc/vmlinuz-prep.initrd" >> $N.mkisofs_opts
@ -94,15 +94,6 @@ do
if [ ! "$DI_DIR" ];then if [ ! "$DI_DIR" ];then
DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images" DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
fi fi
cp -a "$DI_DIR/$subarch/cdrom" "$subarch"
if [ "$subarch" = "powerpc" ]; then
cp -a "$DI_DIR/$subarch/cdrom-minimal" "$subarch/minimal" || true
else
# Supported for netboot only on POWER3 and POWER4.
rm -rf "$subarch/2.4"
# POWER3 and POWER4 PReP machines do not exist.
rm -f "$subarch/vmlinuz-prep.initrd"
fi
else 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/"
fi fi