Merge branch 'master' of https://github.com/greearb/lanforge-scripts

py-json/create_sta.py

@@ -115,7 +115,9 @@ def main():
         lf_r.addPostData( {
             "shelf":1,
             "resource": resource_id,
-            "port": sta_name
+            "port": sta_name,
+            "suppress_preexec_cli": "yes",
+            "suppress_preexec_method": 1
         })
         json_response = lf_r.formPost()
         sleep(0.05) # best to give LANforge a few millis between rm_vlan commands

updateTest.bash

@@ -18,7 +18,7 @@ grep -q "Current GUI version up to date" $GUIUpdate && exit
 
 python3 ${scripts}/connectTest.py &> $CTLGUI
 sleep 1
-pgrep java | xargs kill
+killall -9 java
 sleep 1
 
 ${HL}/LANforgeGUI_5.4.2/lfclient.bash -daemon -s localhost &> $GUILog &