Merge pull request #378 from openweave/issue/more-simnet-shell-fixes

More fixes to simnet's shell command [skip ci]

Author: Jay Logue

src/tools/simnet/simnet.py

@@ -23,6 +23,7 @@
 import subprocess
 import re
 import time
+import tempfile
 try:
     import ipaddress
 except ImportError, ex:
@@ -188,20 +189,52 @@ def startShell(self, node, noOverridePrompt=False):
 
         shell = os.path.realpath(os.path.abspath(os.environ['SHELL']))
 
-        if os.path.basename(shell) == 'bash' and not noOverridePrompt:
-            promptOverride = [ '-c', '''exec $SHELL --rcfile <(cat ~/.bashrc; echo '[ "$SN_NO_OVERRIDE_PROMPT" ] || PS1="\e[1m[\$SN_NODE_NAME]\e[0m $PS1"')''' ]
-        else:
-            promptOverride = [ ]
+        user = os.environ['SUDO_USER']
+        userId = int(os.environ['SUDO_UID'])
+        
+        nodeEnv = {}
+        node.setEnvironVars(nodeEnv)
+        
+        promptOverrideRCFile = None
+
+        try:
+        
+            cmd = [ 'sudo', '-u', user, '--preserve-env=' + ','.join(nodeEnv.keys()), shell ]
+    
+            if os.path.basename(shell) == 'bash' and not noOverridePrompt:
+                promptOverrideRCFile = tempfile.NamedTemporaryFile()
+
+                promptOverrideRCFile.write(''':
+if test -f /etc/bash.bashrc; then
+    . /etc/bash.bashrc
+fi
+if test -f ${HOME}/.bashrc; then
+    . ${HOME}/.bashrc
+fi
+if [ `tput colors` -gt 0 ]; then
+    PS1="\[\e[36m\][\$SN_NODE_NAME] \[\e[0m\]$PS1"
+else
+    PS1="[\$SN_NODE_NAME] $PS1"
+fi
+''')
 
-        cmd = [ 'su', ] + promptOverride + [ os.environ['SUDO_USER'] ]
+                promptOverrideRCFile.flush()
+                
+                os.fchown(promptOverrideRCFile.fileno(), userId, userId)
+
+                cmd += [ '--rcfile', promptOverrideRCFile.name ]
 
-        if not node.isHostNode:
-            cmd = [ 'ip', 'netns', 'exec', node.nsName ] + cmd
+            if not node.isHostNode:
+                cmd = [ 'ip', 'netns', 'exec', node.nsName ] + cmd
+                
+            cmdEnv = os.environ.copy()
+            cmdEnv.update(nodeEnv)
 
-        cmdEnv = os.environ.copy()
-        node.setEnvironVars(cmdEnv)
-        
-        subprocess.call(cmd, env=cmdEnv)
+            subprocess.call(cmd, env=cmdEnv)
+            
+        finally:
+            if promptOverrideRCFile != None:
+                promptOverrideRCFile.close()
 
     def clearAll(self):
         verifyRoot()
@@ -1277,11 +1310,11 @@ def setEnvironVars(self, environ):
         weaveConfig  = '--node-id %016X ' % self.weaveNodeId
         weaveConfig += '--fabric-id %016X ' % self.weaveFabricId
         if self.wifiInterface:
-            weaveConfig += '--default-subnet 1 '
+            weaveConfig += '--subnet 1 '
         elif self.threadInterface:
-            weaveConfig += '--default-subnet 6 '
+            weaveConfig += '--subnet 6 '
         elif self.legacyInterface:
-            weaveConfig += '--default-subnet 2 '
+            weaveConfig += '--subnet 2 '
         if self.useLwIP:
             weaveConfig += self.getLwIPConfig()
         environ['WEAVE_CONFIG'] = weaveConfig