diff options
author | krw <krw@openbsd.org> | 2015-10-25 10:20:51 +0000 |
---|---|---|
committer | krw <krw@openbsd.org> | 2015-10-25 10:20:51 +0000 |
commit | 42c647d8a55bc194eb8e0f370fe82a41bd966bdf (patch) | |
tree | a6e4ce39e2f6a50e55d2d5bc22918ee78d5bee0c | |
parent | Instead of doing the the if_get() dance for rt_missmsg(), change the (diff) | |
download | wireguard-openbsd-42c647d8a55bc194eb8e0f370fe82a41bd966bdf.tar.xz wireguard-openbsd-42c647d8a55bc194eb8e0f370fe82a41bd966bdf.zip |
Use 'fdisk -i', instead of 'fdisk -e' with a here document of
'reinit;update;write;quit'. They've done the same thing for some
time now.
Tweaks & test from rpe@.
ok rpe@ deraadt@
-rw-r--r-- | distrib/amd64/common/install.md | 9 | ||||
-rw-r--r-- | distrib/armish/ramdisk/install.md | 9 | ||||
-rw-r--r-- | distrib/i386/common/install.md | 9 | ||||
-rw-r--r-- | distrib/landisk/ramdisk/install.md | 9 | ||||
-rw-r--r-- | distrib/macppc/ramdisk/install.md | 9 | ||||
-rw-r--r-- | distrib/socppc/ramdisk/install.md | 9 | ||||
-rw-r--r-- | distrib/zaurus/ramdisk/install.md | 9 |
7 files changed, 14 insertions, 49 deletions
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md index d00dfad86a1..9e683451304 100644 --- a/distrib/amd64/common/install.md +++ b/distrib/amd64/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.43 2015/10/09 18:30:54 rpe Exp $ +# $OpenBSD: install.md,v 1.44 2015/10/25 10:20:51 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -72,12 +72,7 @@ md_prep_fdisk() { case $resp in w*|W*) echo -n "Setting OpenBSD MBR partition to whole $_disk..." - fdisk -e ${_disk} <<__EOT >/dev/null -reinit -update -write -quit -__EOT + fdisk -iy $_disk >/dev/null echo "done." return ;; g*|G*) diff --git a/distrib/armish/ramdisk/install.md b/distrib/armish/ramdisk/install.md index 816a5f71678..015b91e0593 100644 --- a/distrib/armish/ramdisk/install.md +++ b/distrib/armish/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.20 2015/06/02 19:54:06 rpe Exp $ +# $OpenBSD: install.md,v 1.21 2015/10/25 10:20:51 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -53,12 +53,7 @@ md_prep_fdisk() { case $resp in w*|W*) echo -n "Setting OpenBSD MBR partition to whole $_disk..." - fdisk -e ${_disk} <<__EOT >/dev/null -reinit -update -write -quit -__EOT + fdisk -iy $_disk >/dev/null echo "done." return ;; e*|E*) diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md index 6969f91072b..d9dee7b0d94 100644 --- a/distrib/i386/common/install.md +++ b/distrib/i386/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.64 2015/06/02 19:54:06 rpe Exp $ +# $OpenBSD: install.md,v 1.65 2015/10/25 10:20:51 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -64,12 +64,7 @@ md_prep_fdisk() { case $resp in w*|W*) echo -n "Setting OpenBSD MBR partition to whole $_disk..." - fdisk -e ${_disk} <<__EOT >/dev/null -reinit -update -write -quit -__EOT + fdisk -iy $_disk >/dev/null echo "done." return ;; e*|E*) diff --git a/distrib/landisk/ramdisk/install.md b/distrib/landisk/ramdisk/install.md index 694e93766ac..153651aa749 100644 --- a/distrib/landisk/ramdisk/install.md +++ b/distrib/landisk/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.35 2015/10/05 04:31:21 miod Exp $ +# $OpenBSD: install.md,v 1.36 2015/10/25 10:20:51 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -58,12 +58,7 @@ md_prep_fdisk() { case $resp in w*|W*) echo -n "Setting OpenBSD MBR partition to whole $_disk..." - fdisk -e ${_disk} <<__EOT >/dev/null -reinit -update -write -quit -__EOT + fdisk -iy $_disk >/dev/null echo "done." return ;; e*|E*) diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md index 7d78ea45256..5da0256ce33 100644 --- a/distrib/macppc/ramdisk/install.md +++ b/distrib/macppc/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.61 2015/10/17 08:47:24 rpe Exp $ +# $OpenBSD: install.md,v 1.62 2015/10/25 10:20:51 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -94,12 +94,7 @@ __EOT w*|W*) echo -n "Creating a 1MB DOS partition and an OpenBSD partition for rest of $_disk..." dd if=/dev/zero of=/dev/r${_disk}c bs=1m count=1 - fdisk -e $_disk <<__EOT >/dev/null -reinit -update -write -quit -__EOT + fdisk -iy $_disk >/dev/null echo "done." break ;; e*|E*) diff --git a/distrib/socppc/ramdisk/install.md b/distrib/socppc/ramdisk/install.md index f564e4a4a7c..89574316c74 100644 --- a/distrib/socppc/ramdisk/install.md +++ b/distrib/socppc/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.22 2015/06/02 19:54:06 rpe Exp $ +# $OpenBSD: install.md,v 1.23 2015/10/25 10:20:51 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -61,12 +61,7 @@ md_prep_fdisk() { case $resp in w*|W*) echo -n "Setting OpenBSD MBR partition to whole $_disk..." - fdisk -e ${_disk} <<__EOT >/dev/null -reinit -update -write -quit -__EOT + fdisk -iy $_disk >/dev/null echo "done." return ;; e*|E*) diff --git a/distrib/zaurus/ramdisk/install.md b/distrib/zaurus/ramdisk/install.md index 78cd5bbce9f..3557c6e23d3 100644 --- a/distrib/zaurus/ramdisk/install.md +++ b/distrib/zaurus/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.35 2015/06/02 19:54:07 rpe Exp $ +# $OpenBSD: install.md,v 1.36 2015/10/25 10:20:51 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -55,12 +55,7 @@ md_prep_fdisk() { case $resp in w*|W*) echo -n "Setting OpenBSD MBR partition to whole $_disk..." - fdisk -e ${_disk} <<__EOT >/dev/null -reinit -update -write -quit -__EOT + fdisk -iy $_disk >/dev/null echo "done." return ;; e*|E*) |