--- anaconda/scripts/mk-images.ia64.org	2005-08-01 13:38:50.099901461 +0200
+++ anaconda/scripts/mk-images.ia64	2005-08-01 14:44:54.661335486 +0200
@@ -40,25 +40,25 @@
 }
 
 makeBootImages() {
-    makebootdisk --kernelto $TOPDESTPATH/kernels/vmlinuz  \
+    makebootdisk --kernelto $TOPDESTPATH/kernels/$PRODUCTPATH/vmlinuz  \
 	--imagename boot.img \
 	--bootdisksize 20480 \
-	--initrdflags '--initrdto $TOPDESTPATH/images/ramdisk.img \
+	--initrdflags '--initrdto $TOPDESTPATH/images/$PRODUCTPATH/ramdisk.img \
 		     	    --initrdsize 12288 \
 			    --loaderbin loader \
 			    --modules "$COMMONMODULES $USBMODS $NETMODULES $SCSIMODULES $IDEMODULES =scsi =net"' 
 
     # now make a boot iso
     mkdir -p $TOPDESTPATH/images/isopath
-    cp -l $TOPDESTPATH/images/boot.img $TOPDESTPATH/images/isopath
-    mkisofs -quiet -o $TOPDESTPATH/images/boot.iso -b boot.img -no-emul-boot -R -J -V "$PRODUCT" -T $TOPDESTPATH/images/isopath
+    cp -l $TOPDESTPATH/images/$PRODUCTPATH/boot.img $TOPDESTPATH/images/isopath
+    mkisofs -quiet -o $TOPDESTPATH/images/$PRODUCTPATH/boot.iso -b boot.img -no-emul-boot -R -J -V "$PRODUCT" -T $TOPDESTPATH/images/isopath
     rm -rf $TOPDESTPATH/images/isopath
 
     # now make a pxe dir with kernel + initrd
-    mkdir -p $TOPDESTPATH/images/pxeboot
-    ln $TOPDESTPATH/images/ramdisk.img $TOPDESTPATH/images/pxeboot/initrd.img
-    ln $TOPDESTPATH/kernels/vmlinuz $TOPDESTPATH/images/pxeboot/vmlinuz
-    cat > $TOPDESTPATH/images/pxeboot/README <<EOF
+    mkdir -p $TOPDESTPATH/images/$PRODUCTPATH/pxeboot
+    ln -f $TOPDESTPATH/images/$PRODUCTPATH/ramdisk.img $TOPDESTPATH/images/$PRODUCTPATH/pxeboot/initrd.img
+    ln -f $TOPDESTPATH/kernels/$PRODUCTPATH/vmlinuz $TOPDESTPATH/images/$PRODUCTPATH/pxeboot/vmlinuz
+    cat > $TOPDESTPATH/images/$PRODUCTPATH/pxeboot/README <<EOF
 The files in this directory are useful for booting a machine via PXE.  
 
 The following files are available:
@@ -68,7 +68,7 @@
 EOF
 
     # clean up
-    rm -f $TOPDESTPATH/images/ramdisk.img
+    rm -f $TOPDESTPATH/images/$PRODUCTPATH/ramdisk.img
     rm -rf $TOPDESTPATH/kernels
 }