diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-11-08 23:58:04 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-11-08 23:58:04 +0000 |
| commit | 351ab2bdc5ee665fe8f58823d9f6734d0dd3bd06 (patch) | |
| tree | 9ab7e4adb9793716ca38164ab86c93a70541dbf8 /distrib | |
| parent | eb9e2288d33e812c9d9d92deb6ec1475ec3124fe (diff) | |
now that fdisk knows landisk machines have a /usr/mdec/mbr, no need to use -f
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/landisk/miniroot/Makefile | 3 | ||||
| -rw-r--r-- | distrib/landisk/ramdisk/install.md | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/distrib/landisk/miniroot/Makefile b/distrib/landisk/miniroot/Makefile index 4f5e2396696..25558284818 100644 --- a/distrib/landisk/miniroot/Makefile +++ b/distrib/landisk/miniroot/Makefile @@ -36,8 +36,7 @@ do_files: rd_setup: dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS} vnconfig -v -c ${VND} ${IMAGE} - fdisk -i -y ${VND} - fdisk -u -f ${DESTDIR}/usr/mdec/mbr -y ${VND} + fdisk -i -u -y ${VND} disklabel -w -r ${VND} ${DISKTYPE} disklabel -v -B -b ${DESTDIR}/usr/mdec/xxboot ${VND} newfs ${NEWFSARGS} ${VND_RDEV} diff --git a/distrib/landisk/ramdisk/install.md b/distrib/landisk/ramdisk/install.md index 390bc2bb7e6..5890c01d808 100644 --- a/distrib/landisk/ramdisk/install.md +++ b/distrib/landisk/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.3 2006/11/08 23:55:05 deraadt Exp $ +# $OpenBSD: install.md,v 1.4 2006/11/08 23:58:03 deraadt Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -79,7 +79,7 @@ md_prep_fdisk() { ask_yn "Do you want to use *all* of $_disk for OpenBSD?" if [[ $resp == y ]]; then echo -n "Putting all of $_disk into an active OpenBSD MBR partition (type 'A6')..." - fdisk -f /usr/mdec/mbr -e ${_disk} <<__EOT >/dev/null + fdisk -e ${_disk} <<__EOT >/dev/null reinit update write @@ -100,7 +100,7 @@ The 'manual' command describes all the fdisk commands in detail. $(fdisk ${_disk}) __EOT - fdisk -f /usr/mdec/mbr -e ${_disk} + fdisk -e ${_disk} cat <<__EOT Here is the partition information you chose: |