From 6a016d5b543c947b4b8a402551ad4765ab8b0da9 Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Tue, 12 Aug 2014 13:26:39 +0200 Subject: [PATCH] Small fixes --- systemvm/patches/debian/config/opt/cloud/bin/configure.py | 3 ++- systemvm/patches/debian/config/opt/cloud/bin/merge.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py index 22784e8deea..d7754d58061 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py +++ b/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) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/merge.py b/systemvm/patches/debian/config/opt/cloud/bin/merge.py index bb6ce3f3618..8196089b44d 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/merge.py +++ b/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)