diff options
| -rw-r--r-- | distrib/miniroot/install.sub | 9 | ||||
| -rw-r--r-- | distrib/miniroot/upgrade.sh | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 74814da2318..bf62da6aee5 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sub,v 1.203 2002/04/13 00:46:46 deraadt Exp $ +# $OpenBSD: install.sub,v 1.204 2002/04/13 21:03:31 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback @@ -1995,11 +1995,14 @@ remount_fs() { done < /etc/fstab } -# Preen all filesystems in /etc/fstab, showing individual results. +# Preen all filesystems in /etc/fstab, showing individual results, +# but skipping the root filesystem device given in $1. This was +# already fsck'ed successfully. check_fs() { - local _dev _rest _badfsck=0 + local _dev _rest _badfsck=0 _root=$1 while read _dev _rest; do + [ "$_dev" = "$_root" ] && continue echo -n "fsck -p ${_dev}..." if ! fsck -fp ${_dev} > /dev/null 2>&1; then echo "FAILED. You must fsck this device manually." diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh index 7ae5d119479..6fff874d128 100644 --- a/distrib/miniroot/upgrade.sh +++ b/distrib/miniroot/upgrade.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: upgrade.sh,v 1.30 2002/04/09 01:01:19 krw Exp $ +# $OpenBSD: upgrade.sh,v 1.31 2002/04/13 21:03:31 deraadt Exp $ # $NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $ # # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback @@ -170,8 +170,8 @@ if ! umount /mnt; then fi # Check filesystems. -echo "Checking filesystem integrity..." -if ! check_fs; then +echo "Checking non-root filesystems..." +if ! check_fs $_root_filesystem; then # Prevent check_fs() invocation in cleanup_on_exit from fsck'ing. # Remember /etc/fstab is a link, /tmp/fstab.shadow is the file! rm /tmp/fstab.shadow |