Remove the $FSTABFLAG variable and use -F directly. The installer

uses disklabel UIDs unconditionally for a while already.

OK krw@
"looks good" deraadt@

20 files changed, 41 insertions, 43 deletions

diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md
index d2874d77fca..1f7c6db7529 100644
--- a/distrib/alpha/common/install.md
+++ b/distrib/alpha/common/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.40 2015/05/31 19:40:10 rpe Exp $
+#       $OpenBSD: install.md,v 1.41 2015/06/02 19:54:06 rpe Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -56,7 +56,7 @@ in this program.
 
 __EOT
 
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md
index 99332b6908a..bf6e8d72877 100644
--- a/distrib/amd64/common/install.md
+++ b/distrib/amd64/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.40 2015/06/02 19:39:18 rpe Exp $
+#	$OpenBSD: install.md,v 1.41 2015/06/02 19:54:06 rpe Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
 
 __EOT
 
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/armish/ramdisk/install.md b/distrib/armish/ramdisk/install.md
index 1ec4072be12..816a5f71678 100644
--- a/distrib/armish/ramdisk/install.md
+++ b/distrib/armish/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.19 2015/06/02 19:39:18 rpe Exp $
+#	$OpenBSD: install.md,v 1.20 2015/06/02 19:54:06 rpe Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
 
 __EOT
 
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md
index 1d5e2a2f50b..ec601121f8e 100644
--- a/distrib/armv7/ramdisk/install.md
+++ b/distrib/armv7/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.11 2015/06/02 19:39:19 rpe Exp $
+#	$OpenBSD: install.md,v 1.12 2015/06/02 19:54:06 rpe Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -207,7 +207,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
 
 __EOT
 
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/aviion/ramdisk/install.md b/distrib/aviion/ramdisk/install.md
index faa138de35e..63ec4475011 100644
--- a/distrib/aviion/ramdisk/install.md
+++ b/distrib/aviion/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.8 2015/05/31 21:21:10 rpe Exp $
+#       $OpenBSD: install.md,v 1.9 2015/06/02 19:54:06 rpe Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -126,7 +126,7 @@ in this program.
 
 __EOT
 
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/hppa/install.md b/distrib/hppa/install.md
index 96b5577caf7..e18a3342400 100644
--- a/distrib/hppa/install.md
+++ b/distrib/hppa/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.29 2015/05/31 19:40:10 rpe Exp $
+#	$OpenBSD: install.md,v 1.30 2015/06/02 19:54:06 rpe Exp $
 #
 # machine dependent section of installation/upgrade script.
 #
@@ -32,7 +32,7 @@ in this program.
 
 __EOT
 
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md
index f86fe24ceec..6969f91072b 100644
--- a/distrib/i386/common/install.md
+++ b/distrib/i386/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.63 2015/06/02 19:39:19 rpe Exp $
+#	$OpenBSD: install.md,v 1.64 2015/06/02 19:54:06 rpe Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
 
 __EOT
 
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/landisk/ramdisk/install.md b/distrib/landisk/ramdisk/install.md
index b8054a23e1d..3bc6e2bf50f 100644
--- a/distrib/landisk/ramdisk/install.md
+++ b/distrib/landisk/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.33 2015/06/02 19:39:19 rpe Exp $
+#	$OpenBSD: install.md,v 1.34 2015/06/02 19:54:06 rpe Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
 
 __EOT
 
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/loongson/ramdisk/install.md b/distrib/loongson/ramdisk/install.md
index 0f993a1df34..bcdd42f967d 100644
--- a/distrib/loongson/ramdisk/install.md
+++ b/distrib/loongson/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.18 2015/05/31 19:40:10 rpe Exp $
+#	$OpenBSD: install.md,v 1.19 2015/06/02 19:54:06 rpe Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
 
 __EOT
 
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/luna88k/ramdisk/install.md b/distrib/luna88k/ramdisk/install.md
index 55738a40ec1..5aa7554c88d 100644
--- a/distrib/luna88k/ramdisk/install.md
+++ b/distrib/luna88k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.20 2015/05/31 19:40:10 rpe Exp $
+#       $OpenBSD: install.md,v 1.21 2015/06/02 19:54:06 rpe Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -54,7 +54,7 @@ and swap space are created.  You must provide each filesystem's mountpoint
 in this program.
 
 __EOT
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md
index 128591e4b35..65c3977c0f4 100644
--- a/distrib/macppc/ramdisk/install.md
+++ b/distrib/macppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.58 2015/05/31 19:40:10 rpe Exp $
+#	$OpenBSD: install.md,v 1.59 2015/06/02 19:54:06 rpe Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -186,7 +186,7 @@ start of the disk, NOT the start of the OpenBSD $PARTTABLE partition.
 
 __EOT
 
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index 1ad4d7dd2a2..8b2c8ef25ef 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: install.sh,v 1.267 2015/05/15 07:41:30 rpe Exp $
+#	$OpenBSD: install.sh,v 1.268 2015/06/02 19:54:06 rpe Exp $
 #	$NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
 #
 # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
@@ -137,8 +137,7 @@ while :; do
 	# Deal with disklabels, including editing the root disklabel
 	# and labeling additional disks. This is machine-dependent since
 	# some platforms may not be able to provide this functionality.
-	# /tmp/fstab.$DISK is created here with 'disklabel -f' or
-	# 'disklabel -F' depending on the value of $FSTABFLAG.
+	# /tmp/fstab.$DISK is created here with 'disklabel -F'.
 	rm -f /tmp/*.$DISK
 	md_prep_disklabel $DISK || { DISK=; continue; }
 
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 1a24a021498..b9de9f7c6fd 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.sub,v 1.842 2015/05/31 19:40:10 rpe Exp $
+#	$OpenBSD: install.sub,v 1.843 2015/06/02 19:54:06 rpe Exp $
 #
 # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
 # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -288,7 +288,7 @@ disklabel_autolayout() {
 		[[ $resp == none ]] && break
 		echo "Fetching $resp"
 		if ftp -Vo $_dl "$resp" && [[ -s $_dl ]]; then
-			disklabel -T $_dl $FSTABFLAG $_f -w -A $_disk && return
+			disklabel -T $_dl -F $_f -w -A $_disk && return
 			echo "Autopartitioning failed"
 			exit 1
 		else
@@ -307,7 +307,7 @@ disklabel_autolayout() {
 		c*|C*)	return 0 ;;
 		*)	continue ;;
 		esac
-		disklabel $FSTABFLAG $_f $_op -A $_disk
+		disklabel -F $_f $_op -A $_disk
 		return
 	done
 }
@@ -2266,7 +2266,6 @@ HTTP_DIR=
 HTTP_SEC=/tmp/httpsec
 HTTP_LIST=/tmp/httplist
 WLANLIST=/tmp/wlanlist
-FSTABFLAG=-F
 
 # Do not limit ourselves during installs or upgrades.
 for _opt in d f l m n p s; do
diff --git a/distrib/octeon/ramdisk/install.md b/distrib/octeon/ramdisk/install.md
index 3ab20b7a3af..9de62a7bb24 100644
--- a/distrib/octeon/ramdisk/install.md
+++ b/distrib/octeon/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.9 2015/06/02 19:39:19 rpe Exp $
+#	$OpenBSD: install.md,v 1.10 2015/06/02 19:54:06 rpe Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -128,7 +128,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
 
 __EOT
 
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/sgi/ramdisk/install.md b/distrib/sgi/ramdisk/install.md
index 7c5ef2e74a2..45e8bccd885 100644
--- a/distrib/sgi/ramdisk/install.md
+++ b/distrib/sgi/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.35 2015/05/31 19:40:10 rpe Exp $
+#	$OpenBSD: install.md,v 1.36 2015/06/02 19:54:06 rpe Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -163,7 +163,7 @@ boot loader will not be able to locate and load the kernel.
 Do not change any parameters except the partition layout and the label name.
 
 __EOT
-	disklabel -c $FSTABFLAG /tmp/fstab.$_disk -E $_disk
+	disklabel -c -F /tmp/fstab.$_disk -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/socppc/ramdisk/install.md b/distrib/socppc/ramdisk/install.md
index 19f2e214275..f564e4a4a7c 100644
--- a/distrib/socppc/ramdisk/install.md
+++ b/distrib/socppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.21 2015/06/02 19:39:19 rpe Exp $
+#	$OpenBSD: install.md,v 1.22 2015/06/02 19:54:06 rpe Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -108,7 +108,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
 
 __EOT
 
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md
index 392fc8e1799..cd592a3db07 100644
--- a/distrib/sparc/install.md
+++ b/distrib/sparc/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.72 2015/05/31 19:40:10 rpe Exp $
+#	$OpenBSD: install.md,v 1.73 2015/06/02 19:54:07 rpe Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -58,7 +58,7 @@ and swap space are created.  You must provide each filesystem's mountpoint
 in this program.
 
 __EOT
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/sparc64/common/install.md b/distrib/sparc64/common/install.md
index fc2a875f0d4..235feb7458b 100644
--- a/distrib/sparc64/common/install.md
+++ b/distrib/sparc64/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.44 2015/05/31 19:40:11 rpe Exp $
+#	$OpenBSD: install.md,v 1.45 2015/06/02 19:54:07 rpe Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -63,7 +63,7 @@ in this program.
 
 __EOT
 
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/vax/install.md b/distrib/vax/install.md
index 93c4b3e99d4..043860aae99 100644
--- a/distrib/vax/install.md
+++ b/distrib/vax/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.44 2015/05/31 19:40:11 rpe Exp $
+#	$OpenBSD: install.md,v 1.45 2015/06/02 19:54:07 rpe Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -58,7 +58,7 @@ in this program.
 
 __EOT
 
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {
diff --git a/distrib/zaurus/ramdisk/install.md b/distrib/zaurus/ramdisk/install.md
index 37421956452..78cd5bbce9f 100644
--- a/distrib/zaurus/ramdisk/install.md
+++ b/distrib/zaurus/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.34 2015/06/02 19:39:19 rpe Exp $
+#	$OpenBSD: install.md,v 1.35 2015/06/02 19:54:07 rpe Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -102,7 +102,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
 
 __EOT
 
-	disklabel $FSTABFLAG $_f -E $_disk
+	disklabel -F $_f -E $_disk
 }
 
 md_congrats() {