diff options
| author |   krw <krw@openbsd.org> | 2009-06-03 00:30:31 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2009-06-03 00:30:31 +0000 |
| commit | b0a86e11afa2a3ccf3695d41a3695113e8e0103c (patch) | |
| tree | 9ff10d15bee6650f4f655f879a7fa6f160fea3f6 | |
| parent | jordan and marco claim this is about to work, so stop spreading dread (diff) | |
| download | wireguard-openbsd-b0a86e11afa2a3ccf3695d41a3695113e8e0103c.tar.xz wireguard-openbsd-b0a86e11afa2a3ccf3695d41a3695113e8e0103c.zip | |
Only need to umount once on restarting. Force umounts in case of
restarting. No need to ask for verbose umount output since we send
it all to /dev/null. Make sure we start in '/', lest we were restarted
while exploring the installed/upgraded filesystems.
| -rw-r--r-- | distrib/miniroot/install.sh | 3 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index c470b5383db..a2634189bab 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sh,v 1.199 2009/06/02 23:53:34 krw Exp $ +# $OpenBSD: install.sh,v 1.200 2009/06/03 00:30:31 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 @@ -68,7 +68,6 @@ DISK= _DKDEVS=$(get_dkdevs) # Remove traces of previous install attempt. -umount -a rm -f /tmp/fstab.shadow /tmp/fstab /tmp/fstab.* while :; do diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index abca60339b3..b5ff490b400 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.569 2009/06/02 23:53:34 krw Exp $ +# $OpenBSD: install.sub,v 1.570 2009/06/03 00:30:31 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 @@ -1835,8 +1835,9 @@ COLUMNS=$(stty -a | sed -n '/columns/{s/^.* \([0-9]*\) columns.*$/\1/;p;}') export EDITOR COLUMNS # umount all filesystems, just in case we are re-running install or upgrade. -[[ -f /etc/fstab ]] && umount -av 1>/dev/null 2>&1 -umount -v /mnt 1>/dev/null 2>&1 +cd / +[[ -f /etc/fstab ]] && umount -af 1>/dev/null 2>&1 +umount /mnt 1>/dev/null 2>&1 # Introduce ourselves. welcome |