diff options
| author | Peter Stromberg <wilfried@cvs.openbsd.org> | 2003-04-23 12:06:56 +0000 |
|---|---|---|
| committer | Peter Stromberg <wilfried@cvs.openbsd.org> | 2003-04-23 12:06:56 +0000 |
| commit | 968020292b7da5e5d381cbb3842d25b8321eb7d9 (patch) | |
| tree | 5ea743a73a27ec6e3c224a892ebc44fdc3b7ae86 | |
| parent | 293dbed45969c4ed5c8772c1a060bb1d81b79787 (diff) | |
ignore altroot filesystem when upgrading, ok krw@
| -rw-r--r-- | distrib/miniroot/install.sub | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 0747b5d6085..2afdc6a7041 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.295 2003/04/17 19:15:49 deraadt Exp $ +# $OpenBSD: install.sub,v 1.296 2003/04/23 12:06:55 wilfried Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2003 Todd Miller, Theo de Raadt, Ken Westerback @@ -1514,10 +1514,11 @@ __EOT } # Create a /etc/fstab from /tmp/fstab. Ensure /etc/fstab -# 1) contains only ffs filesystems -# 2) contains only filesystems without the 'noauto' option -# 3) contains no 'softdep' options -# 4) mounts all filesystems relative to /mnt +# 1) contains only filesystems we can mount +# 2) contains no altroot filesystem +# 3) contains only filesystems without the 'noauto' option +# 4) contains no 'softdep' options +# 5) mounts all filesystems relative to /mnt # # If no /etc/fstab is created, do not proceed with install/upgrade. munge_fstab() { @@ -1529,9 +1530,9 @@ munge_fstab() { \#*) continue ;; esac - # Skip noauto filesystems. + # Skip noauto and altroot filesystems. case $_opt in - *noauto*) continue ;; + *noauto*|*xx*) continue ;; esac # Skip filesystems we can't mount. |