From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 1 Jul 2008 09:59:09 +0000 (+0100)
Subject: xend: open qemu-dm logfile in append mode if log rotation is disabled by config.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14192^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=03f7fd7c9f565b3c6f30a7ac82bdfe5fb0ca6127;p=xen.git

xend: open qemu-dm logfile in append mode if log rotation is disabled by config.

Signed-off-by: Yosuke Iwamatsu <y-iwamatsu@ab.jp.nec.com>
---

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 4cf792fe88..ccebcfc033 100644
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -380,8 +380,10 @@ class ImageHandler:
         self.logfile = "/var/log/xen/qemu-dm-%s.log" %  str(self.vm.info['name_label'])
 
         # rotate log
+        logfile_mode = os.O_WRONLY|os.O_CREAT|os.O_APPEND
         logrotate_count = XendOptions.instance().get_qemu_dm_logrotate_count()
         if logrotate_count > 0:
+            logfile_mode |= os.O_TRUNC
             if os.path.exists("%s.%d" % (self.logfile, logrotate_count)):
                 os.unlink("%s.%d" % (self.logfile, logrotate_count))
             for n in range(logrotate_count - 1, 0, -1):
@@ -392,7 +394,7 @@ class ImageHandler:
                 os.rename(self.logfile, self.logfile + ".1")
 
         null = os.open("/dev/null", os.O_RDONLY)
-        logfd = os.open(self.logfile, os.O_WRONLY|os.O_CREAT|os.O_TRUNC|os.O_APPEND)
+        logfd = os.open(self.logfile, logfile_mode)
         
         sys.stderr.flush()
         pid = os.fork()