Mercurial > illumos > illumos-gate
changeset 13080:e24fd5d1ac5b
6974329 txzonemgr auto-initialization of labeled zones fails
| author | Ric Aleshire <Ric.Aleshire@Sun.COM> |
|---|---|
| date | Tue, 10 Aug 2010 20:59:33 -0700 |
| parents | 9c11d9f612c8 |
| children | 79b387e27d99 |
| files | usr/src/cmd/tsol/misc/txzonemgr.sh |
| diffstat | 1 files changed, 7 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/tsol/misc/txzonemgr.sh Wed Aug 11 11:46:21 2010 +0800 +++ b/usr/src/cmd/tsol/misc/txzonemgr.sh Tue Aug 10 20:59:33 2010 -0700 @@ -576,6 +576,12 @@ 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 @@ return 1 fi - if [ $NSCD_PER_LABEL = 0 ] ; then - sharePasswd $zonename - else - unsharePasswd $zonename - fi - initialize zoneadm -z $zonename halt } @@ -1085,12 +1085,7 @@ 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,