diff options
| -rw-r--r-- | distrib/socppc/miniroot/Makefile | 2 | ||||
| -rw-r--r-- | etc/etc.socppc/disktab | 4 | ||||
| -rw-r--r-- | sys/arch/socppc/stand/mbr/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/socppc/stand/mbr/mbr.S | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/distrib/socppc/miniroot/Makefile b/distrib/socppc/miniroot/Makefile index 5c260c37ae2..e6aabd5570e 100644 --- a/distrib/socppc/miniroot/Makefile +++ b/distrib/socppc/miniroot/Makefile @@ -39,7 +39,7 @@ do_files: rd_setup: dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS} vnconfig -v -c -t ${DISKTYPE} ${VND} ${IMAGE} - dd if=${DESTDIR}/usr/mdec/mbr.mini of=${VND_CDEV} + fdisk -i -y ${VND} disklabel -w ${VND} ${DISKTYPE} newfs ${NEWFSARGS} ${VND_RDEV} fsck ${VND_RDEV} diff --git a/etc/etc.socppc/disktab b/etc/etc.socppc/disktab index 62249f3fb60..b7cc0c05eb2 100644 --- a/etc/etc.socppc/disktab +++ b/etc/etc.socppc/disktab @@ -1,4 +1,4 @@ -# $OpenBSD: disktab,v 1.2 2010/02/15 13:46:50 kettenis Exp $ +# $OpenBSD: disktab,v 1.3 2010/02/15 22:56:21 kettenis Exp $ # # @(#)disktab 5.5 (Berkeley) 2/27/91 # @@ -24,5 +24,5 @@ rdroot|ramdiskroot|RAM-disk root FS image:\ miniroot|Installation root FS image:\ :ty=simulated:se#512:nc#8:nt#16:ns#63:\ - :ta=4.2BSD:oa#575:pa#7489:fa#512:ba#4096:\ + :ta=4.2BSD:oa#1008:pa#7056:fa#512:ba#4096:\ :ob#0:pb#0:oc#0:pc#8064:ti=boot:oi#63:pi#512: diff --git a/sys/arch/socppc/stand/mbr/Makefile b/sys/arch/socppc/stand/mbr/Makefile index 7d6e19be453..ee73ec018d3 100644 --- a/sys/arch/socppc/stand/mbr/Makefile +++ b/sys/arch/socppc/stand/mbr/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2010/02/15 13:43:24 kettenis Exp $ +# $OpenBSD: Makefile,v 1.2 2010/02/15 22:56:21 kettenis Exp $ .include <bsd.own.mk> @@ -6,7 +6,7 @@ NOMAN= #MAN= mbr.8 .if ${MACHINE} == "socppc" -PROG= mbr.mini +PROG= mbr SRCS= mbr.S AFLAGS+=-I${.OBJDIR} -I${.CURDIR}/../../.. #-Wa,a LDFLAGS+=-N -e start -Ttext 0 diff --git a/sys/arch/socppc/stand/mbr/mbr.S b/sys/arch/socppc/stand/mbr/mbr.S index 4da867aab49..b71472d8840 100644 --- a/sys/arch/socppc/stand/mbr/mbr.S +++ b/sys/arch/socppc/stand/mbr/mbr.S @@ -16,8 +16,8 @@ ENTRY(start) */ . = _C_LABEL(start) + 0x1be _pbr_part0: - .byte 0x80, 1, 1, 0, 0x27, 9, 8, 0 - .byte 0x3f, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 + .byte 0x80, 0, 0, 0, 0x27, 0, 0, 0 + .byte 0x3f, 0, 0, 0, 0, 0x02, 0, 0 _pbr_part1: .byte 0, 0, 0, 0, 0, 0, 0, 0 .byte 0, 0, 0, 0, 0, 0, 0, 0 @@ -25,8 +25,8 @@ _pbr_part2: .byte 0, 0, 0, 0, 0, 0, 0, 0 .byte 0, 0, 0, 0, 0, 0, 0, 0 _pbr_part3: - .byte 0, 9, 9, 0, 0xa6, 15, 63, 7 - .byte 0x3f, 0x02, 0x00, 0x00, 0x41, 0x1d, 0x00, 0x00 + .byte 0, 0, 0, 0, 0, 0, 0, 0 + .byte 0, 0, 0, 0, 0, 0, 0, 0 . = _C_LABEL(start) + 0x1fe magic: |