0017-Add-journal-flush-service-for-Microsoft-Azure-VMs.patch

From 0628c6cd77457aff4b3dbd04e838d67195e8e481 Mon Sep 17 00:00:00 2001
From: Matthew Johnson <matthew.johnson@intel.com>
Date: Tue, 20 Sep 2016 10:49:55 -0700
Subject: [PATCH 17/38] Add journal flush service for Microsoft Azure VMs

Removes "Before" clause when in a Microsoft VM.
---
 units/meson.build                           |  4 +++-
 units/systemd-journal-flush-msft.service.in | 22 +++++++++++++++++++++
 units/systemd-journal-flush.service         |  1 +
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 units/systemd-journal-flush-msft.service.in

diff --git a/units/meson.build b/units/meson.build
index 89ea147fbe..2278cac28a 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -194,7 +194,9 @@ in_units = [
          'sysinit.target.wants/'],
         ['systemd-importd.service',              'ENABLE_IMPORTD',
          'dbus-org.freedesktop.import1.service'],
-        ['systemd-initctl.service',              'HAVE_SYSV_COMPAT'],
+        ['systemd-initctl.service',               ''],
+        ['systemd-journal-flush-msft.service',    '',
+         'sysinit.target.wants/'],
         ['systemd-journal-gatewayd.service',     'ENABLE_REMOTE HAVE_MICROHTTPD'],
         ['systemd-journal-remote.service',       'ENABLE_REMOTE HAVE_MICROHTTPD'],
         ['systemd-journal-upload.service',       'ENABLE_REMOTE HAVE_LIBCURL'],
diff --git a/units/systemd-journal-flush-msft.service.in b/units/systemd-journal-flush-msft.service.in
new file mode 100644
index 0000000000..091d50c9fa
--- /dev/null
+++ b/units/systemd-journal-flush-msft.service.in
@@ -0,0 +1,22 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Flush Journal to Persistent Storage
+Documentation=man:systemd-journald.service(8) man:journald.conf(5)
+DefaultDependencies=no
+Requires=systemd-journald.service
+After=systemd-journald.service
+After=systemd-remount-fs.service
+RequiresMountsFor=/var/log/journal
+ConditionVirtualization=microsoft
+
+[Service]
+ExecStart=journalctl --flush
+Type=oneshot
+RemainAfterExit=yes
+TimeoutSec=90s
diff --git a/units/systemd-journal-flush.service b/units/systemd-journal-flush.service
index 5d0b811ae3..675145055c 100644
--- a/units/systemd-journal-flush.service
+++ b/units/systemd-journal-flush.service
@@ -16,6 +16,7 @@ After=systemd-journald.service systemd-remount-fs.service
 Before=systemd-tmpfiles-setup.service
 RequiresMountsFor=/var/log/journal
 ConditionPathExists=!/etc/initrd-release
+ConditionVirtualization=!microsoft
 
 [Service]
 ExecStart=journalctl --flush
-- 
2.36.1