Small fixes

systemvm/patches/debian/config/opt/cloud/bin/configure.py

@@ -666,7 +666,8 @@ def main(argv):
             continue
         ip = CsIP(dev)
         for address in dbag[dev]:
-            CsRoute(dev).add(address)
+            if not address["nw_type"] == "control":
+                CsRoute(dev).add(address)
             ip.setAddress(address)
             if ip.configured():
                 logging.info("Address %s on device %s already configured", ip.ip(), dev)

systemvm/patches/debian/config/opt/cloud/bin/merge.py

@@ -166,6 +166,6 @@ class loadQueueFile:
     def __moveFile(self, origPath, path):
         if not os.path.exists(path):
             os.makedirs(path)
-        timestamp = str(round(time.time()))
+        timestamp = str(int(round(time.time())))
         os.rename(origPath, path + "/" + self.fileName + "." + timestamp)