diff options
| author | Robert Peichaer <rpe@cvs.openbsd.org> | 2015-05-15 07:41:31 +0000 |
|---|---|---|
| committer | Robert Peichaer <rpe@cvs.openbsd.org> | 2015-05-15 07:41:31 +0000 |
| commit | 6eceebde6144e8c88d4a722b87ccb569a02c58c9 (patch) | |
| tree | 5dd94f38349d79c589b6ba76faab6dcbf3fe7843 | |
| parent | 4ca9555bbe1639cb0677a9560e147697d827e609 (diff) | |
Remove the 'Use DUIDs rather than device names in fstab?' question
and use DUIDs unconditionally. DUIDs in the installed /etc/fstab
has been the default for quite some time now.
OK deraadt@, krw@, guenther@, beck@
| -rw-r--r-- | distrib/miniroot/install.sh | 4 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index db0f3b54d4d..1ad4d7dd2a2 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sh,v 1.266 2015/04/27 23:17:11 djm Exp $ +# $OpenBSD: install.sh,v 1.267 2015/05/15 07:41:30 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 @@ -112,8 +112,6 @@ _fsent= # Remove traces of previous install attempt. rm -f /tmp/fstab* -ask_yn "Use DUIDs rather than device names in fstab?" yes && FSTABFLAG=-F - # Configure the disk(s). while :; do DISKS_DONE=$(addel "$DISK" $DISKS_DONE) diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 9965d59bf49..9a0fde9c42c 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.837 2015/05/14 10:58:55 rpe Exp $ +# $OpenBSD: install.sub,v 1.838 2015/05/15 07:41:30 rpe Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -2254,7 +2254,7 @@ HTTP_DIR= HTTP_SEC=/tmp/httpsec HTTP_LIST=/tmp/httplist WLANLIST=/tmp/wlanlist -FSTABFLAG=-f +FSTABFLAG=-F # Do not limit ourselves during installs or upgrades. for _opt in d f l m n p s; do |