summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--release/Makefile4
-rw-r--r--release/ia64/dokern.sh6
-rw-r--r--release/ia64/mkisoimages.sh36
3 files changed, 16 insertions, 30 deletions
diff --git a/release/Makefile b/release/Makefile
index c7f3731..ba2c3e7 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -218,12 +218,10 @@ MFSINODE= 8192
BIGBOOTLABEL= auto
MFSLABEL= auto
.elif ${TARGET_ARCH} == "ia64"
-BIGBOOTLABEL= efi
-BIGBOOTSIZE= 5154
-BOOTINODE= 15872
MFSINODE= 8192
MFSLABEL= auto
MFSSIZE= 8192
+NO_FLOPPIES=
.elif ${TARGET_ARCH} == "amd64"
MFSSIZE= 4096
MFSINODE= 8192
diff --git a/release/ia64/dokern.sh b/release/ia64/dokern.sh
deleted file mode 100644
index 5882014..0000000
--- a/release/ia64/dokern.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-sed -e 's/ident.*GENERIC/ident BOOTMFS/g'
diff --git a/release/ia64/mkisoimages.sh b/release/ia64/mkisoimages.sh
index b53af41..d8ea135 100644
--- a/release/ia64/mkisoimages.sh
+++ b/release/ia64/mkisoimages.sh
@@ -73,27 +73,21 @@ EFIPART=efipart.sys
# system partition. Since we already made that on the boot floppy,
# we sneakily extract that.
if [ $bootable = yes ]; then
- if [ -f $BASE/floppies/boot.flp ]; then
- md=`mdconfig -a -t vnode -f $BASE/floppies/boot.flp`
- dd if=/dev/${md}p1 of=$BASE/$EFIPART
- mdconfig -d -u $md
- else
- EFISZ=20480
- MNT=/mnt
- dd if=/dev/zero of=$BASE/$EFIPART count=$EFISZ
- md=`mdconfig -a -t vnode -f $BASE/$EFIPART`
- newfs_msdos -F 12 -S 512 -h 4 -o 0 -s $EFISZ -u 16 $md
- mount -t msdos /dev/$md $MNT
- mkdir -p $MNT/efi/boot $MNT/boot $MNT/boot/kernel
- cp -R $BASE/boot/defaults $MNT/boot
- cp $BASE/boot/kernel/kernel $MNT/boot/kernel
- cp $BASE/boot/device.hints $MNT/boot
- cp $BASE/boot/loader.* $MNT/boot
- cp $BASE/boot/support.4th $MNT/boot
- mv $MNT/boot/loader.efi $MNT/efi/boot/bootia64.efi
- umount $MNT
- mdconfig -d -u $md
- fi
+ EFISZ=20480
+ MNT=/mnt
+ dd if=/dev/zero of=$BASE/$EFIPART count=$EFISZ
+ md=`mdconfig -a -t vnode -f $BASE/$EFIPART`
+ newfs_msdos -F 12 -S 512 -h 4 -o 0 -s $EFISZ -u 16 $md
+ mount -t msdos /dev/$md $MNT
+ mkdir -p $MNT/efi/boot $MNT/boot $MNT/boot/kernel
+ cp -R $BASE/boot/defaults $MNT/boot
+ cp $BASE/boot/kernel/kernel $MNT/boot/kernel
+ cp $BASE/boot/device.hints $MNT/boot
+ cp $BASE/boot/loader.* $MNT/boot
+ cp $BASE/boot/support.4th $MNT/boot
+ mv $MNT/boot/loader.efi $MNT/efi/boot/bootia64.efi
+ umount $MNT
+ mdconfig -d -u $md
BOOTOPTS="-b $EFIPART -no-emul-boot"
fi
OpenPOWER on IntegriCloud