diff options
| author |   deraadt <deraadt@openbsd.org> | 2011-07-24 02:08:10 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2011-07-24 02:08:10 +0000 |
| commit | 02cc025ac5e7cd97341efb34050f95fffa9259d0 (patch) | |
| tree | dd17966b0459fd42b75b9714d72137d1fedc3d75 | |
| parent | Update PF table regress tests to work with -current. (diff) | |
| download | wireguard-openbsd-02cc025ac5e7cd97341efb34050f95fffa9259d0.tar.xz wireguard-openbsd-02cc025ac5e7cd97341efb34050f95fffa9259d0.zip | |
back out conv=sync change; the disk subsystem changes which "required"
this are gone, and halex points out that one of the dd's in use has
no conv= support.
| -rw-r--r-- | distrib/socppc/miniroot/Makefile | 2 | ||||
| -rw-r--r-- | distrib/socppc/ramdisk/install.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/distrib/socppc/miniroot/Makefile b/distrib/socppc/miniroot/Makefile index 253f9f8aa3f..8ccef938e3d 100644 --- a/distrib/socppc/miniroot/Makefile +++ b/distrib/socppc/miniroot/Makefile @@ -33,7 +33,7 @@ ${IMAGE}: rd_setup do_files rd_teardown .endif do_files: - dd if=${DESTDIR}/usr/mdec/boot.elf of=${VND_IRDEV} conv=sync + dd if=${DESTDIR}/usr/mdec/boot.elf of=${VND_IRDEV} gzip -c < ${.OBJDIR}/../ramdisk/bsd.rd > ${MOUNT_POINT}/bsd.rd ln ${MOUNT_POINT}/bsd.rd ${MOUNT_POINT}/bsd diff --git a/distrib/socppc/ramdisk/install.md b/distrib/socppc/ramdisk/install.md index 659315a94a1..184d8e63c18 100644 --- a/distrib/socppc/ramdisk/install.md +++ b/distrib/socppc/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.14 2011/07/15 16:29:57 deraadt Exp $ +# $OpenBSD: install.md,v 1.15 2011/07/24 02:08:10 deraadt Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ md_installboot() { local _disk=$1 - if dd if=/usr/mdec/boot.elf of=/dev/${_disk}i conv=sync; then + if dd if=/usr/mdec/boot.elf of=/dev/${_disk}i; then return fi |