summaryrefslogtreecommitdiff
path: root/usr/src/cmd/zoneadmd
diff options
context:
space:
mode:
authorRic Aleshire <Ric.Aleshire@Sun.COM>2008-09-26 17:38:02 -0700
committerRic Aleshire <Ric.Aleshire@Sun.COM>2008-09-26 17:38:02 -0700
commit756cf395eeed223c9a257b925950b5fce28939f8 (patch)
tree74d9d0a0eb59a6caa8a92ab5ee6eccf701de3079 /usr/src/cmd/zoneadmd
parent907f0cacfc5d8be3ad3eca7cc7f37f103567f321 (diff)
downloadillumos-joyent-756cf395eeed223c9a257b925950b5fce28939f8.tar.gz
6746407 [tx] cannot upgrade s10u5_10 -> s10u6_07 TX system with ufs zone if passwd included in zones xmls
Diffstat (limited to 'usr/src/cmd/zoneadmd')
-rw-r--r--usr/src/cmd/zoneadmd/vplat.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr/src/cmd/zoneadmd/vplat.c b/usr/src/cmd/zoneadmd/vplat.c
index 28194da33e..4693435f9f 100644
--- a/usr/src/cmd/zoneadmd/vplat.c
+++ b/usr/src/cmd/zoneadmd/vplat.c
@@ -437,12 +437,10 @@ make_one_dir(zlog_t *zlogp, const char *prefix, const char *subdir, mode_t mode,
* and we don't need to second guess him.
*/
if (!S_ISDIR(st.st_mode)) {
- if (is_system_labeled() &&
- S_ISREG(st.st_mode)) {
+ if (S_ISREG(st.st_mode)) {
/*
- * The need to mount readonly copies of
- * global zone /etc/ files is unique to
- * Trusted Extensions.
+ * Allow readonly mounts of /etc/ files; this
+ * is needed most by Trusted Extensions.
*/
if (strncmp(subdir, "/etc/",
strlen("/etc/")) != 0) {