diff options
| author | Brandon Mercer <bmercer@cvs.openbsd.org> | 2013-07-30 02:49:55 +0000 |
|---|---|---|
| committer | Brandon Mercer <bmercer@cvs.openbsd.org> | 2013-07-30 02:49:55 +0000 |
| commit | 6a10132ad0a74dd5e7577b3f6f221c1f1d3ea559 (patch) | |
| tree | 3e678e9788b1b7b1288d8bd414ccb91104a3b352 /distrib | |
| parent | 019b846f60fb78199fb23f6f55b2b8c6d1127287 (diff) | |
Update the installer with sane defaults for disk parititioning and drop the dependency on objcopy in favor of the updates to mkuboot.
OK deraadt@
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/beagle/ramdisk/install.md | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/distrib/beagle/ramdisk/install.md b/distrib/beagle/ramdisk/install.md index bd551023a31..b6fb459c951 100644 --- a/distrib/beagle/ramdisk/install.md +++ b/distrib/beagle/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.7 2013/07/15 15:49:33 rapha Exp $ +# $OpenBSD: install.md,v 1.8 2013/07/30 02:49:54 bmercer Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -35,9 +35,8 @@ md_installboot() { local _disk=$1 mount /dev/${_disk}i /mnt/mnt - /mnt/usr/sbin/chroot /mnt /usr/bin/objcopy -O binary /bsd /bsd.img /mnt/usr/sbin/chroot /mnt /usr/sbin/mkuboot -a arm -o linux \ - -e 0x80300000 -l 0x80300000 /bsd.img /mnt/bsd.umg + -e 0x80300000 -l 0x80300000 /bsd /mnt/bsd.umg cp -r /tmp/u-boots/* /mnt/usr/mdec/ BEAGLE=$(scan_dmesg '/^omap0 at mainbus0: \(BeagleBoard\).*/s//\1/p') BEAGLEBONE=$(scan_dmesg '/^omap0 at mainbus0: \(BeagleBone\).*/s//\1/p') @@ -65,10 +64,6 @@ md_prep_fdisk() { _d=whole if [[ -n $(fdisk $_disk | grep 'Signature: 0xAA55') ]]; then fdisk $_disk - if [[ -n $(fdisk $_disk | grep '^..: A6 ') ]]; then - _q=", use the (O)penBSD area," - _d=OpenBSD - fi else echo "MBR has invalid signature; not showing it." fi |