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

uses disklabel UIDs unconditionally for a while already.

OK krw@
"looks good" deraadt@

diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md
index d2874d7..1f7c6db 100644 (file)
--- 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 99332b6..bf6e8d7 100644 (file)
--- 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 1ec4072..816a5f7 100644 (file)
--- 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 1d5e2a2..ec60112 100644 (file)
--- 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 faa138d..63ec447 100644 (file)
--- 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 96b5577..e18a334 100644 (file)
--- 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 f86fe24..6969f91 100644 (file)
--- 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 b8054a2..3bc6e2b 100644 (file)
--- 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 0f993a1..bcdd42f 100644 (file)
--- 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 55738a4..5aa7554 100644 (file)
--- 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 128591e..65c3977 100644 (file)
--- 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 1ad4d7d..8b2c8ef 100644 (file)
--- 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 1a24a02..b9de9f7 100644 (file)
--- 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 3ab20b7..9de62a7 100644 (file)
--- 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 7c5ef2e..45e8bcc 100644 (file)
--- 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 19f2e21..f564e4a 100644 (file)
--- 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 392fc8e..cd592a3 100644 (file)
--- 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 fc2a875..235feb7 100644 (file)
--- 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 93c4b3e..043860a 100644 (file)
--- 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 3742195..78cd5bb 100644 (file)
--- 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() {