Ticket #3757: makehaikufloppy.diff

File makehaikufloppy.diff, 2.5 KB (added by haiqu, 15 years ago)

makebootfloppy script fix for new directory structure

  • makehaikufloppy

     
    8787        echo "Error creating temporary boot image"
    8888        exit 1
    8989    fi
    90     dd if=$BASE/beos/system/zbeos of=/tmp/boot.img conv=notrunc
     90    dd if=$BASE/beos/system/haiku_loader of=/tmp/boot.img conv=notrunc
    9191    dd if=/tmp/boot.tgz of=/tmp/boot.img bs=192k seek=1 conv=notrunc
    9292
    9393    echo "Writing boot image to "$IMAGE
    … …  
    106106    # non-CD mode (only writes the bare boot loader)
    107107
    108108    echo "Writing boot loader..."
    109     dd if=$BASE/beos/system/zbeos of=$IMAGE bs=18k
     109    dd if=$BASE/beos/system/haiku_loader of=$IMAGE bs=18k
    110110    if [ $? != 0 ] ; then
    111111        echo "Error creating boot floppy"
    112112        exit 1

  • makehaikufloppy

     
    5454    echo "Creating boot image..."
    5555
    5656    mkdir -p /tmp/beos/system
    57     cp $BASE/beos/system/kernel_x86 /tmp/beos/system/
     57    cp $BASE/system/kernel_x86 /tmp/system/
    5858    oldCWD=$(pwd)
    5959
    6060    cd /tmp
    … …  
    6565    cd $BASE
    6666    pwd
    6767    tar rvhf /tmp/boot.tar \
    68         beos/system/add-ons/kernel/busses/ide \
    69         beos/system/add-ons/kernel/bus_managers \
    70         beos/system/add-ons/kernel/file_systems/bfs \
    71         beos/system/add-ons/kernel/generic \
    72         beos/system/add-ons/kernel/partitioning_systems \
    73         beos/system/add-ons/kernel/drivers/bin/scsi* \
    74         beos/system/add-ons/kernel/file_systems/bfs \
     68        system/add-ons/kernel/busses/ide \
     69        system/add-ons/kernel/bus_managers \
     70        system/add-ons/kernel/file_systems/bfs \
     71        system/add-ons/kernel/generic \
     72        system/add-ons/kernel/partitioning_systems \
     73        system/add-ons/kernel/drivers/bin/scsi* \
     74        system/add-ons/kernel/file_systems/bfs \
    7575        > /dev/null
    76 #       beos/system/add-ons/kernel/boot \
     76#       system/add-ons/kernel/boot \
    7777    gzip -c /tmp/boot.tar > /tmp/boot.tgz
    7878    rm /tmp/boot.tar
    7979    cd $oldCWD
    … …  
    8787        echo "Error creating temporary boot image"
    8888        exit 1
    8989    fi
    90     dd if=$BASE/beos/system/zbeos of=/tmp/boot.img conv=notrunc
     90    dd if=$BASE/system/haiku_loader of=/tmp/boot.img conv=notrunc
    9191    dd if=/tmp/boot.tgz of=/tmp/boot.img bs=192k seek=1 conv=notrunc
    9292
    9393    echo "Writing boot image to "$IMAGE
    … …  
    106106    # non-CD mode (only writes the bare boot loader)
    107107
    108108    echo "Writing boot loader..."
    109     dd if=$BASE/beos/system/zbeos of=$IMAGE bs=18k
     109    dd if=$BASE/system/haiku_loader of=$IMAGE bs=18k
    110110    if [ $? != 0 ] ; then
    111111        echo "Error creating boot floppy"
    112112        exit 1