OS-3138 fix mdata-client in LX zones.

MerlinDMC · Jun 26, 2014 · 8ab8e30 · 8ab8e30
1 parent 8bb0e84
commit 8ab8e30
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/overlay/generic/usr/lib/brand/lx/statechange b/overlay/generic/usr/lib/brand/lx/statechange
@@ -30,6 +30,6 @@ jst_simplefs="yes"
 # jst_showsnap="yes"
 
 # Where does the mdata socket live?
-jst_mdatapath="/.zonecontrol/"
+jst_mdatapath="/native/.zonecontrol/"
 
 . /usr/lib/brand/jcommon/statechange
diff --git a/src/vm/lib/metadata/agent.js b/src/vm/lib/metadata/agent.js
@@ -339,7 +339,13 @@ function (zonename, callback) {
     var zlog = self.zlog[zonename];
     var zonePath = self.zones[zonename].zonepath;
     var localpath = '/.zonecontrol';
-    var zonecontrolpath = path.join(zonePath, 'root', localpath);
+    var zonecontrolpath;
+
+    if (self.zones[zonename].brand === 'lx') {
+        localpath = '/native' + localpath;
+    }
+
+    zonecontrolpath = path.join(zonePath, 'root', localpath);
 
     zlog.info('Starting socket server');