diff options
| author | Ric Aleshire <Ric.Aleshire@Sun.COM> | 2010-08-10 20:59:33 -0700 |
|---|---|---|
| committer | Ric Aleshire <Ric.Aleshire@Sun.COM> | 2010-08-10 20:59:33 -0700 |
| commit | 3492b16344977c5f5655da823a2b4d6bddf55970 (patch) | |
| tree | e861f3a2ba861c91894bbbcdce84eb1b64d4dfc5 | |
| parent | 8b6b46fa78678dde030a42f13e79c08d0c5f39b9 (diff) | |
| download | illumos-joyent-3492b16344977c5f5655da823a2b4d6bddf55970.tar.gz | |
6974329 txzonemgr auto-initialization of labeled zones fails
| -rw-r--r-- | usr/src/cmd/tsol/misc/txzonemgr.sh | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/usr/src/cmd/tsol/misc/txzonemgr.sh b/usr/src/cmd/tsol/misc/txzonemgr.sh index 1c6a49d8d4..ab0cd7d3f5 100644 --- a/usr/src/cmd/tsol/misc/txzonemgr.sh +++ b/usr/src/cmd/tsol/misc/txzonemgr.sh @@ -576,6 +576,12 @@ install() { return 1 fi + if [ $NSCD_PER_LABEL = 0 ] ; then + sharePasswd $zonename + else + unsharePasswd $zonename + fi + zoneadm -z $zonename ready zonestate=$(zoneadm -z $zonename list -p | cut -d : -f 3) if [ $zonestate != ready ] ; then @@ -583,12 +589,6 @@ install() { return 1 fi - if [ $NSCD_PER_LABEL = 0 ] ; then - sharePasswd $zonename - else - unsharePasswd $zonename - fi - initialize zoneadm -z $zonename halt } @@ -1085,12 +1085,7 @@ sharePasswd() { add options ro; \ end" fi - zoneadm -z $1 ready >/dev/null 2>&1 - if [ $? -eq 0 ] ; then - zoneadm -z $1 halt >/dev/null 2>&1 - else - echo Skipping $1 - fi + zoneadm -z $1 halt >/dev/null 2>&1 } # This routine is a toggle -- if we find it configured for global nscd, |