diff options
| author | Bill Pijewski <wdp@joyent.com> | 2012-08-21 11:44:04 -0700 |
|---|---|---|
| committer | Bill Pijewski <wdp@joyent.com> | 2012-08-21 11:44:04 -0700 |
| commit | 7e45878386ab225b23a98204613241e4c0e8fa7c (patch) | |
| tree | d3a6eee50d1cf58834c8aa3708d4b5d649a6c560 | |
| parent | 6653d3d1c680a578739cf3baf976456c21d50a07 (diff) | |
| download | illumos-joyent-7e45878386ab225b23a98204613241e4c0e8fa7c.tar.gz | |
OS-1484 lack of "smbfs" in /etc/dfs/fstypes prevents mounting during zone boot
| -rw-r--r-- | usr/src/cmd/initpkg/mountall.sh | 5 | ||||
| -rw-r--r-- | usr/src/cmd/initpkg/umountall.sh | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/usr/src/cmd/initpkg/mountall.sh b/usr/src/cmd/initpkg/mountall.sh index 56f2798e18..38693dd8da 100644 --- a/usr/src/cmd/initpkg/mountall.sh +++ b/usr/src/cmd/initpkg/mountall.sh @@ -28,6 +28,8 @@ # Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T # All Rights Reserved # +# Copyright (c) 2012, Joyent, Inc. All rights reserved. +# usage () { if [ -n "$1" ]; then @@ -148,6 +150,9 @@ isremote() { # Get list of remote FS types (just once) RemoteFSTypes=`while read t junk; do echo $t; done < /etc/dfs/fstypes` +# Ensure nfs/smbfs are remote FS types even if not delivered from fstypes +isremote "nfs" || set -A RemoteFSTypes "nfs" +isremote "smbfs" || set -A RemoteFSTypes "smbfs" # # Process command line args diff --git a/usr/src/cmd/initpkg/umountall.sh b/usr/src/cmd/initpkg/umountall.sh index c9a94fd8f1..4a45e19e18 100644 --- a/usr/src/cmd/initpkg/umountall.sh +++ b/usr/src/cmd/initpkg/umountall.sh @@ -25,6 +25,7 @@ # Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T # All Rights Reserved # +# Copyright (c) 2012, Joyent, Inc. All rights reserved. # usage () { @@ -98,6 +99,9 @@ isremote() { # Get list of remote FS types (just once) RemoteFSTypes=`while read t junk; do echo $t; done < /etc/dfs/fstypes` +# Ensure nfs/smbfs are remote FS types even if not delivered from fstypes +isremote "nfs" || set -A RemoteFSTypes "nfs" +isremote "smbfs" || set -A RemoteFSTypes "smbfs" # # Process command line args |