No longer need '-f' or '-p' when displaying layout. A few patterns

missed the '# size offset ...' line at the top of the partition
list.

18 files changed, 36 insertions, 36 deletions

diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md
index a730d0aea0c..698ccdff50c 100644
--- a/distrib/alpha/common/install.md
+++ b/distrib/alpha/common/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.25 2009/04/10 23:11:17 krw Exp $
+#       $OpenBSD: install.md,v 1.26 2009/04/12 01:35:00 krw Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -57,7 +57,7 @@ md_prep_disklabel() {
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | egrep "^#|^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md
index bdab1b27299..7581a990548 100644
--- a/distrib/amd64/common/install.md
+++ b/distrib/amd64/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.11 2009/04/10 23:11:17 krw Exp $
+#	$OpenBSD: install.md,v 1.12 2009/04/12 01:35:01 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@ md_prep_disklabel() {
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | grep "^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/armish/ramdisk/install.md b/distrib/armish/ramdisk/install.md
index 67e89164673..bbc6ecb9a38 100644
--- a/distrib/armish/ramdisk/install.md
+++ b/distrib/armish/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.6 2009/04/10 23:11:17 krw Exp $
+#	$OpenBSD: install.md,v 1.7 2009/04/12 01:35:01 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -83,7 +83,7 @@ md_prep_disklabel() {
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | grep "^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md
index 4da0ace7e15..bc3ed33cae5 100644
--- a/distrib/hp300/ramdisk/install.md
+++ b/distrib/hp300/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.47 2009/04/10 23:11:17 krw Exp $
+#	$OpenBSD: install.md,v 1.48 2009/04/12 01:35:01 krw Exp $
 #	$NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@ md_prep_disklabel() {
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | egrep "^#|^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/hppa/install.md b/distrib/hppa/install.md
index 153d7ad30cf..79c70154c36 100644
--- a/distrib/hppa/install.md
+++ b/distrib/hppa/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.9 2009/04/10 23:11:17 krw Exp $
+#	$OpenBSD: install.md,v 1.10 2009/04/12 01:35:01 krw Exp $
 #
 # machine dependent section of installation/upgrade script.
 #
@@ -20,7 +20,7 @@ md_prep_disklabel() {
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | egrep "^#|^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md
index 3e0cb24bfa4..fafe605c4cf 100644
--- a/distrib/i386/common/install.md
+++ b/distrib/i386/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.34 2009/04/10 23:11:17 krw Exp $
+#	$OpenBSD: install.md,v 1.35 2009/04/12 01:35:01 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@ md_prep_disklabel() {
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | grep "^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/landisk/ramdisk/install.md b/distrib/landisk/ramdisk/install.md
index 4028a7c455c..6eddcc60ac8 100644
--- a/distrib/landisk/ramdisk/install.md
+++ b/distrib/landisk/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.16 2009/04/10 23:11:17 krw Exp $
+#	$OpenBSD: install.md,v 1.17 2009/04/12 01:35:01 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@ md_prep_disklabel() {
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | grep "^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/luna88k/ramdisk/install.md b/distrib/luna88k/ramdisk/install.md
index 9ae15724c0e..101f47ccfc2 100644
--- a/distrib/luna88k/ramdisk/install.md
+++ b/distrib/luna88k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.7 2009/04/10 23:11:17 krw Exp $
+#       $OpenBSD: install.md,v 1.8 2009/04/12 01:35:01 krw Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -46,7 +46,7 @@ md_prep_disklabel() {
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | egrep "^#|^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/mac68k/ramdisk/install.md b/distrib/mac68k/ramdisk/install.md
index 232cdd95442..db70fe7517c 100644
--- a/distrib/mac68k/ramdisk/install.md
+++ b/distrib/mac68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.30 2009/04/10 23:11:17 krw Exp $
+#       $OpenBSD: install.md,v 1.31 2009/04/12 01:35:01 krw Exp $
 #
 # Copyright (c) 2002, Miodrag Vallat.
 # All rights reserved.
@@ -85,7 +85,7 @@ __EOT
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | egrep "^#|^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md
index d93f7b3a8eb..a9ead90654f 100644
--- a/distrib/macppc/ramdisk/install.md
+++ b/distrib/macppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.36 2009/04/10 23:11:17 krw Exp $
+#	$OpenBSD: install.md,v 1.37 2009/04/12 01:35:01 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -162,7 +162,7 @@ __EOT
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | egrep "^#|^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/mvme68k/ramdisk/install.md b/distrib/mvme68k/ramdisk/install.md
index 4a4307c576d..c580708665a 100644
--- a/distrib/mvme68k/ramdisk/install.md
+++ b/distrib/mvme68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.32 2009/04/10 23:11:17 krw Exp $
+#       $OpenBSD: install.md,v 1.33 2009/04/12 01:35:01 krw Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -48,7 +48,7 @@ md_prep_disklabel() {
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | egrep "^#|^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/mvme88k/ramdisk/install.md b/distrib/mvme88k/ramdisk/install.md
index 3b40185459a..471652c4762 100644
--- a/distrib/mvme88k/ramdisk/install.md
+++ b/distrib/mvme88k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.28 2009/04/10 23:11:17 krw Exp $
+#       $OpenBSD: install.md,v 1.29 2009/04/12 01:35:01 krw Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -48,7 +48,7 @@ md_prep_disklabel() {
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | egrep "^#|^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/sgi/ramdisk/install.md b/distrib/sgi/ramdisk/install.md
index 32199d638f4..75400edda6b 100644
--- a/distrib/sgi/ramdisk/install.md
+++ b/distrib/sgi/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.13 2009/04/10 23:11:17 krw Exp $
+#	$OpenBSD: install.md,v 1.14 2009/04/12 01:35:01 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -126,7 +126,7 @@ __EOT
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | grep "^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/socppc/ramdisk/install.md b/distrib/socppc/ramdisk/install.md
index 4a84ce1aa87..70edab99a7a 100644
--- a/distrib/socppc/ramdisk/install.md
+++ b/distrib/socppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.4 2009/04/10 23:11:17 krw Exp $
+#	$OpenBSD: install.md,v 1.5 2009/04/12 01:35:01 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -83,7 +83,7 @@ md_prep_disklabel() {
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | egrep "^#|^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md
index 2ea252c8b93..da7fd9f2e23 100644
--- a/distrib/sparc/install.md
+++ b/distrib/sparc/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.56 2009/04/10 23:11:17 krw Exp $
+#	$OpenBSD: install.md,v 1.57 2009/04/12 01:35:01 krw Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -64,7 +64,7 @@ md_prep_disklabel() {
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | egrep "^#|^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/sparc64/common/install.md b/distrib/sparc64/common/install.md
index 7bc23d2f026..2abba426ad6 100644
--- a/distrib/sparc64/common/install.md
+++ b/distrib/sparc64/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.23 2009/04/10 23:11:17 krw Exp $
+#	$OpenBSD: install.md,v 1.24 2009/04/12 01:35:01 krw Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -74,7 +74,7 @@ md_prep_disklabel() {
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | egrep "^#|^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/vax/install.md b/distrib/vax/install.md
index 3a7ea30f293..b513f5cdade 100644
--- a/distrib/vax/install.md
+++ b/distrib/vax/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.29 2009/04/10 23:11:17 krw Exp $
+#	$OpenBSD: install.md,v 1.30 2009/04/12 01:35:01 krw Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -53,7 +53,7 @@ md_prep_disklabel() {
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | egrep "^#|^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;
diff --git a/distrib/zaurus/ramdisk/install.md b/distrib/zaurus/ramdisk/install.md
index c86a2942479..175b91ca359 100644
--- a/distrib/zaurus/ramdisk/install.md
+++ b/distrib/zaurus/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.17 2009/04/10 23:11:17 krw Exp $
+#	$OpenBSD: install.md,v 1.18 2009/04/12 01:35:01 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -83,7 +83,7 @@ md_prep_disklabel() {
 	if [[ $_disk == $ROOTDISK ]]; then
 		while :; do
 			echo "The auto-allocated layout for $_disk is:"
-			disklabel -f $_f -p g -A $_disk | grep "^  [a-p]:"
+			disklabel -A $_disk | egrep "^#|^  [a-p]:"
 			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
 			case $resp in
 			a*|A*)	_op=-w ; AUTOROOT=y ;;