more in the logs, including actual arch in host boxes and stuff

diff --git a/system/TestPlc.py b/system/TestPlc.py
index f5ea38e..8bc5d27 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -653,7 +653,7 @@ class TestPlc:
                 # try to run 'hostname' in the node
                 # using locally cached keys - assuming we've run testplc.fetch_keys()
                 local_key = "keys/%(vservername)s.rsa"%locals()
-                command = TestSsh (hostname,key=local_key).actual_command("hostname")
+                command = TestSsh (hostname,key=local_key).actual_command("hostname;uname -a")
                 # don't spam logs - show the command only after the grace period 
                 if datetime.datetime.now() > graceout:
                     success=utils.system(command)

diff --git a/system/template-qemu/qemu-bridge-init b/system/template-qemu/qemu-bridge-init
index 896503b..a3e89b4 100755 (executable)
--- a/system/template-qemu/qemu-bridge-init
+++ b/system/template-qemu/qemu-bridge-init
@@ -21,6 +21,12 @@ INTERFACE_LAN=eth0
 # Fonction de mise en place du pont
 start () {
 
+    echo "========== $COMMAND: entering start - beg"
+    hostname
+    uname -a
+    ifconfig
+    echo "========== $COMMAND: entering start - end"
+
     # take extra arg for ifname, if provided
     [ -n "$1" ] && { INTERFACE_LAN=$1; shift ; }
 
@@ -84,6 +90,9 @@ start () {
     echo "Configuring gateway=$gateway"
     route add default gw $gateway
 
+    echo "========== $COMMAND: exiting start - beg"
+    ifconfig
+    echo "========== $COMMAND: exiting start - end"
 }
 
 #Adding a new interface to the bridge: this is used by qemu-ifup 
@@ -92,6 +101,10 @@ add () {
     [[ -z "$@" ]] && { echo "Usage: $COMMAND add ifname" ; exit 1 ; }
     INTERFACE_LAN=$1; shift
 
+    echo "========== $COMMAND: entering add - beg"
+    ifconfig
+    echo "========== $COMMAND: entering add - end"
+
     echo "Activating link for $INTERFACE_LAN..."
     /sbin/ip link set $INTERFACE_LAN up
     sleep 1
@@ -111,9 +124,14 @@ add () {
     ./iptables.py iptables.pre iptables.post $IP
     iptables-restore < iptables.post
 
+    echo "========== $COMMAND: exiting add - beg"
+
+    ifconfig
+
     echo "Installed iptables"
     iptables-save
     
+    echo "========== $COMMAND: exiting add - end"
 }
 
 #Stop the bridge and restore the original setting