summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
Diffstat (limited to 'distrib')
-rw-r--r--distrib/alpha/common/install.md6
-rw-r--r--distrib/amd64/common/install.md6
-rw-r--r--distrib/armish/ramdisk/install.md6
-rw-r--r--distrib/beagle/ramdisk/install.md6
-rw-r--r--distrib/hp300/ramdisk/install.md6
-rw-r--r--distrib/hppa/install.md6
-rw-r--r--distrib/i386/common/install.md6
-rw-r--r--distrib/landisk/ramdisk/install.md6
-rw-r--r--distrib/loongson/ramdisk/install.md6
-rw-r--r--distrib/luna88k/ramdisk/install.md6
-rw-r--r--distrib/mac68k/ramdisk/install.md6
-rw-r--r--distrib/macppc/ramdisk/install.md6
-rw-r--r--distrib/miniroot/install.sh23
-rw-r--r--distrib/miniroot/install.sub3
-rw-r--r--distrib/mvme68k/ramdisk/install.md6
-rw-r--r--distrib/mvme88k/ramdisk/install.md6
-rw-r--r--distrib/palm/ramdisk/install.md6
-rw-r--r--distrib/sgi/ramdisk/install.md6
-rw-r--r--distrib/socppc/ramdisk/install.md6
-rw-r--r--distrib/sparc/install.md6
-rw-r--r--distrib/sparc64/common/install.md6
-rw-r--r--distrib/vax/install.md6
-rw-r--r--distrib/zaurus/ramdisk/install.md6
23 files changed, 80 insertions, 72 deletions
diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md
index 73d5fa5c13e..3bea2cd6bb2 100644
--- a/distrib/alpha/common/install.md
+++ b/distrib/alpha/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.31 2009/06/04 00:44:46 krw Exp $
+# $OpenBSD: install.md,v 1.32 2011/04/17 20:57:10 krw Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -62,7 +62,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -74,7 +74,7 @@ in this program.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md
index f53aab57c1b..b85b3656b02 100644
--- a/distrib/amd64/common/install.md
+++ b/distrib/amd64/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.27 2011/03/22 19:20:16 krw Exp $
+# $OpenBSD: install.md,v 1.28 2011/04/17 20:57:10 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -133,7 +133,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/armish/ramdisk/install.md b/distrib/armish/ramdisk/install.md
index fa66940efa6..9682cde3c17 100644
--- a/distrib/armish/ramdisk/install.md
+++ b/distrib/armish/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.13 2009/06/11 04:28:50 deraadt Exp $
+# $OpenBSD: install.md,v 1.14 2011/04/17 20:57:10 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -98,7 +98,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -115,7 +115,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/beagle/ramdisk/install.md b/distrib/beagle/ramdisk/install.md
index 10947220c27..ff291a8f2cf 100644
--- a/distrib/beagle/ramdisk/install.md
+++ b/distrib/beagle/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.1 2011/03/14 16:40:23 drahn Exp $
+# $OpenBSD: install.md,v 1.2 2011/04/17 20:57:11 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -98,7 +98,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -115,7 +115,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md
index d9b23cf7d5f..95c1918788c 100644
--- a/distrib/hp300/ramdisk/install.md
+++ b/distrib/hp300/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.55 2009/06/14 00:12:20 deraadt Exp $
+# $OpenBSD: install.md,v 1.56 2011/04/17 20:57:10 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.
@@ -56,7 +56,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -68,7 +68,7 @@ in this program.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/hppa/install.md b/distrib/hppa/install.md
index 405e4e6119c..e0e9c71a443 100644
--- a/distrib/hppa/install.md
+++ b/distrib/hppa/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.18 2011/01/01 17:25:06 deraadt Exp $
+# $OpenBSD: install.md,v 1.19 2011/04/17 20:57:10 krw Exp $
#
# machine dependent section of installation/upgrade script.
#
@@ -36,7 +36,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -48,7 +48,7 @@ in this program.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md
index 37dcd4b19a0..19a72ee89da 100644
--- a/distrib/i386/common/install.md
+++ b/distrib/i386/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.51 2011/03/22 19:20:16 krw Exp $
+# $OpenBSD: install.md,v 1.52 2011/04/17 20:57:10 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -135,7 +135,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/landisk/ramdisk/install.md b/distrib/landisk/ramdisk/install.md
index e97b402b3e5..8315c95277d 100644
--- a/distrib/landisk/ramdisk/install.md
+++ b/distrib/landisk/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.25 2009/06/11 04:28:50 deraadt Exp $
+# $OpenBSD: install.md,v 1.26 2011/04/17 20:57:10 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -106,7 +106,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -123,7 +123,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/loongson/ramdisk/install.md b/distrib/loongson/ramdisk/install.md
index 434bbf2b0e9..04d25c5ada5 100644
--- a/distrib/loongson/ramdisk/install.md
+++ b/distrib/loongson/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.5 2010/04/03 21:41:26 miod Exp $
+# $OpenBSD: install.md,v 1.6 2011/04/17 20:57:10 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -143,7 +143,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -160,7 +160,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/luna88k/ramdisk/install.md b/distrib/luna88k/ramdisk/install.md
index e3616ebabd9..29b1ace397d 100644
--- a/distrib/luna88k/ramdisk/install.md
+++ b/distrib/luna88k/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.12 2009/06/04 00:44:47 krw Exp $
+# $OpenBSD: install.md,v 1.13 2011/04/17 20:57:10 krw Exp $
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
#
@@ -53,7 +53,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -64,7 +64,7 @@ and swap space are created. You must provide each filesystem's mountpoint
in this program.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/mac68k/ramdisk/install.md b/distrib/mac68k/ramdisk/install.md
index 39d5042447f..0378cd247f9 100644
--- a/distrib/mac68k/ramdisk/install.md
+++ b/distrib/mac68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.36 2009/06/04 00:44:47 krw Exp $
+# $OpenBSD: install.md,v 1.37 2011/04/17 20:57:10 krw Exp $
#
# Copyright (c) 2002, Miodrag Vallat.
# All rights reserved.
@@ -85,7 +85,7 @@ __EOT
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -96,7 +96,7 @@ and swap space are created. You must provide each filesystem's mountpoint
in this program.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md
index 76d6f1d2e86..e45ed1c0fe7 100644
--- a/distrib/macppc/ramdisk/install.md
+++ b/distrib/macppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.48 2011/01/03 00:36:49 deraadt Exp $
+# $OpenBSD: install.md,v 1.49 2011/04/17 20:57:10 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -188,7 +188,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -205,7 +205,7 @@ start of the disk, NOT the start of the OpenBSD $PARTTABLE partition.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index cc5157a63ed..31d4eca9eaa 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sh,v 1.218 2011/04/04 14:37:25 ajacoutot Exp $
+# $OpenBSD: install.sh,v 1.219 2011/04/17 20:57:10 krw Exp $
# $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -70,6 +70,9 @@ _DKDEVS=$(get_dkdevs)
# Remove traces of previous install attempt.
rm -f /tmp/fstab.shadow /tmp/fstab /tmp/fstab.*
+ask_yn "Use DUIDs rather than device names in fstab?"
+[[ $resp == y ]] && FSTABFLAG=-F
+
while :; do
DISKS_DONE=$(addel "$DISK" $DISKS_DONE)
_DKDEVS=$(rmel "$DISK" $_DKDEVS)
@@ -96,7 +99,8 @@ 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'.
+ # /tmp/fstab.$DISK is created here with 'disklabel -f' or
+ # 'disklabel -F' depending on the value of $FSTABFLAG.
rm -f /tmp/*.$DISK
AUTOROOT=n
md_prep_disklabel $DISK || { DISK= ; continue ; }
@@ -108,11 +112,19 @@ while :; do
if [[ -f /tmp/fstab.$DISK ]]; then
# Avoid duplicate mount points on different disks.
while read _pp _mp _rest; do
+ if [[ $_mp == "none" ]]; then
+ # Multiple swap partitions are ok.
+ echo "$_pp $_mp $_rest" >>/tmp/fstab
+ continue
+ fi
+ # Non-swap mountpoints must be in only one file.
[[ /tmp/fstab.$DISK == $(grep -l " $_mp " /tmp/fstab.*) ]] || \
{ _rest=$DISK ; DISK= ; break ; }
done </tmp/fstab.$DISK
if [[ -z $DISK ]]; then
- # Allow disklabel(8) to read mountpoint info.
+ # Duplicate mountpoint.
+ # Allow disklabel(8) to read back mountpoint info
+ # if it is immediately run against the same disk.
cat /tmp/fstab.$_rest >/etc/fstab
rm /tmp/fstab.$_rest
set -- $(grep -h " $_mp " /tmp/fstab.*[0-9])
@@ -135,11 +147,6 @@ while :; do
: $(( _i += 1 ))
done </tmp/fstab.$DISK
fi
-
- # New swap partitions?
- disklabel $DISK 2>&1 | sed -ne \
- "/^ *\([a-p]\): .* swap /s,,/dev/$DISK\1 none swap sw 0 0,p" | \
- grep -v "^/dev/$SWAPDEV " >>/tmp/fstab
done
# Write fstab entries to fstab in mount point alphabetic order
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index ddbc64bd16c..8b1df75fd03 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.636 2011/03/22 19:20:15 krw Exp $
+# $OpenBSD: install.sub,v 1.637 2011/04/17 20:57:10 krw Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -1991,6 +1991,7 @@ SERVERLISTALL=/tmp/serverlistall
SERVERLISTSEC=/tmp/serverlistsec
SERVERLIST=/tmp/serverlist
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/mvme68k/ramdisk/install.md b/distrib/mvme68k/ramdisk/install.md
index f48961573b1..58218ec53b6 100644
--- a/distrib/mvme68k/ramdisk/install.md
+++ b/distrib/mvme68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.39 2009/06/04 00:44:47 krw Exp $
+# $OpenBSD: install.md,v 1.40 2011/04/17 20:57:10 krw Exp $
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
#
@@ -54,7 +54,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -66,7 +66,7 @@ in this program.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/mvme88k/ramdisk/install.md b/distrib/mvme88k/ramdisk/install.md
index 9675a1bcffe..33b9413d593 100644
--- a/distrib/mvme88k/ramdisk/install.md
+++ b/distrib/mvme88k/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.38 2011/01/03 00:36:50 deraadt Exp $
+# $OpenBSD: install.md,v 1.39 2011/04/17 20:57:11 krw Exp $
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
#
@@ -63,7 +63,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -75,7 +75,7 @@ in this program.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/palm/ramdisk/install.md b/distrib/palm/ramdisk/install.md
index b98be612553..89decea0233 100644
--- a/distrib/palm/ramdisk/install.md
+++ b/distrib/palm/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.1 2009/09/05 02:06:48 marex Exp $
+# $OpenBSD: install.md,v 1.2 2011/04/17 20:57:11 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -117,7 +117,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/sgi/ramdisk/install.md b/distrib/sgi/ramdisk/install.md
index 8a9ad3cbc8a..cc734cfaeb7 100644
--- a/distrib/sgi/ramdisk/install.md
+++ b/distrib/sgi/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.26 2011/02/19 10:18:03 miod Exp $
+# $OpenBSD: install.md,v 1.27 2011/04/17 20:57:11 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -160,7 +160,7 @@ __EOT
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -182,7 +182,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 -f /tmp/fstab.$_disk -E $_disk
+ disklabel -c $FSTABFLAG /tmp/fstab.$_disk -E $_disk
}
md_congrats() {
diff --git a/distrib/socppc/ramdisk/install.md b/distrib/socppc/ramdisk/install.md
index f36b494a2b9..0fe384e8946 100644
--- a/distrib/socppc/ramdisk/install.md
+++ b/distrib/socppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.12 2010/02/17 19:55:53 kettenis Exp $
+# $OpenBSD: install.md,v 1.13 2011/04/17 20:57:11 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -106,7 +106,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -123,7 +123,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md
index ea268b19655..42c82082e83 100644
--- a/distrib/sparc/install.md
+++ b/distrib/sparc/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.64 2009/06/04 00:44:47 krw Exp $
+# $OpenBSD: install.md,v 1.65 2011/04/17 20:57:11 krw Exp $
# $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
#
#
@@ -71,7 +71,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -83,7 +83,7 @@ and swap space are created. You must provide each filesystem's mountpoint
in this program.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/sparc64/common/install.md b/distrib/sparc64/common/install.md
index 6f42920c0d2..6d252403d14 100644
--- a/distrib/sparc64/common/install.md
+++ b/distrib/sparc64/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.34 2011/01/03 00:36:50 deraadt Exp $
+# $OpenBSD: install.md,v 1.35 2011/04/17 20:57:11 krw Exp $
# $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
#
#
@@ -80,7 +80,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -93,7 +93,7 @@ in this program.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/vax/install.md b/distrib/vax/install.md
index b884055f441..b2eb686ca98 100644
--- a/distrib/vax/install.md
+++ b/distrib/vax/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.35 2009/06/04 00:44:48 krw Exp $
+# $OpenBSD: install.md,v 1.36 2011/04/17 20:57:11 krw Exp $
# $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
#
#
@@ -59,7 +59,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -71,7 +71,7 @@ in this program.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
diff --git a/distrib/zaurus/ramdisk/install.md b/distrib/zaurus/ramdisk/install.md
index 05b06e27447..5a253cdd085 100644
--- a/distrib/zaurus/ramdisk/install.md
+++ b/distrib/zaurus/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.26 2010/08/08 21:06:06 krw Exp $
+# $OpenBSD: install.md,v 1.27 2011/04/17 20:57:11 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@ md_prep_disklabel() {
c*|C*) break ;;
*) continue ;;
esac
- disklabel -f $_f $_op -A $_disk
+ disklabel $FSTABFLAG $_f $_op -A $_disk
return
done
fi
@@ -117,7 +117,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
__EOT
- disklabel -f $_f -E $_disk
+ disklabel $FSTABFLAG $_f -E $_disk
}
md_congrats() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 22:30:18 +0000