summaryrefslogtreecommitdiff
path: root/distrib/miniroot/upgrade.sh
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2009-04-25 17:43:09 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2009-04-25 17:43:09 +0000
commit9a50d87732628b9194fdca203ff208f9688ab95c (patch)
tree469c533bfab80460ea6fb1836edbd650725631ad /distrib/miniroot/upgrade.sh
parent7b2d1e5b58d0107ac5d3f008ecfeabeee9bf5dfb (diff)
During upgrades don't bother displaying the fstab to be 'munged'
and a long explanation of what is about to happen. Unlikely this was read by or helped many. Fewer distractions make better users.
Diffstat (limited to 'distrib/miniroot/upgrade.sh')
-rw-r--r--distrib/miniroot/upgrade.sh19
1 files changed, 2 insertions, 17 deletions
diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh
index 484b4320b44..3d6543ff233 100644
--- a/distrib/miniroot/upgrade.sh
+++ b/distrib/miniroot/upgrade.sh
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: upgrade.sh,v 1.66 2009/04/25 16:55:02 krw Exp $
+# $OpenBSD: upgrade.sh,v 1.67 2009/04/25 17:43:08 krw Exp $
# $NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -83,22 +83,7 @@ THESETS="$THESETS site$VERSION-$(hostname -s).tgz"
enable_network
manual_net_cfg
-cat <<__EOT
-
-The fstab is configured as follows:
-
-$(</tmp/fstab)
-
-For the $MODE, filesystems in the fstab will be automatically mounted if the
-'noauto' option is absent, and /sbin/mount_<fstype> is found, and the fstype is
-not nfs. Non-ffs filesystems will be mounted read-only.
-
-You can edit the fstab now, before it is used, but the edited fstab will only
-be used during the upgrade. It will not be copied back to disk.
-__EOT
-edit_tmp_file fstab
-
-# Create /etc/fstab.
+# Create fstab for use during upgrade.
munge_fstab
# fsck -p non-root filesystems in /etc/fstab.