dryang / rpms / systemd

Forked from rpms/systemd a year ago
Clone
923a60
From a714212703b3fe5f2a27773602cabbc4ab53da15 Mon Sep 17 00:00:00 2001
923a60
From: Martin Pitt <martin.pitt@ubuntu.com>
923a60
Date: Mon, 15 Jun 2015 08:59:44 +0200
923a60
Subject: [PATCH] sysv-generator test: always log to console
923a60
923a60
Set $SYSTEMD_LOG_TARGET so that the output always goes to stdout/stderr. This
923a60
fixes running the test as root, as that logged to the journal previously.
923a60
923a60
https://github.com/systemd/systemd/issues/195
923a60
923a60
Cherry-picked from: 6b7d32add4733a83f86e18bb86f914037a6688b7
923a60
Resolves: #1279034
923a60
---
923a60
 test/sysv-generator-test.py | 1 +
923a60
 1 file changed, 1 insertion(+)
923a60
923a60
diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
923a60
index e716d705c0..153786417a 100644
923a60
--- a/test/sysv-generator-test.py
923a60
+++ b/test/sysv-generator-test.py
923a60
@@ -60,6 +60,7 @@ class SysvGeneratorTest(unittest.TestCase):
923a60
         '''
923a60
         env = os.environ.copy()
923a60
         env['SYSTEMD_LOG_LEVEL'] = 'debug'
923a60
+        env['SYSTEMD_LOG_TARGET'] = 'console'
923a60
         env['SYSTEMD_SYSVINIT_PATH'] = self.init_d_dir
923a60
         env['SYSTEMD_SYSVRCND_PATH'] = self.rcnd_dir
923a60
         env['SYSTEMD_UNIT_PATH'] = self.unit_dir