summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorcarlsonj <none@none>2006-09-20 07:31:30 -0700
committercarlsonj <none@none>2006-09-20 07:31:30 -0700
commit68eeb376c093800c57934faf0fd98aa59e67aa9f (patch)
tree70642e0744ed6b27b762f1c45c9f28b41ecabcda /usr/src
parent8cff005a5ef135be3dd987282bb060c9b79b669b (diff)
downloadillumos-gate-68eeb376c093800c57934faf0fd98aa59e67aa9f.tar.gz
6471974 zoneadm mount mishandles shared file systems
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/zoneadmd/vplat.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/cmd/zoneadmd/vplat.c b/usr/src/cmd/zoneadmd/vplat.c
index 5a6b7e5cdd..a4dac6488a 100644
--- a/usr/src/cmd/zoneadmd/vplat.c
+++ b/usr/src/cmd/zoneadmd/vplat.c
@@ -1126,10 +1126,10 @@ mount_one(zlog_t *zlogp, struct zone_fstab *fsptr, const char *rootpath)
struct stat64 st;
if (stat64(fsptr->zone_fs_special, &st) != -1 &&
- S_ISBLK(st.st_mode) &&
- check_lofs_needed(zlogp, fsptr) == -1)
- return (-1);
- if (strcmp(fsptr->zone_fs_type, MNTTYPE_LOFS) == 0) {
+ S_ISBLK(st.st_mode)) {
+ if (check_lofs_needed(zlogp, fsptr) == -1)
+ return (-1);
+ } else if (strcmp(fsptr->zone_fs_type, MNTTYPE_LOFS) == 0) {
if (snprintf(specpath, sizeof (specpath), "%s%s",
zonecfg_get_root(), fsptr->zone_fs_special) >=
sizeof (specpath)) {