summaryrefslogtreecommitdiff
path: root/systemd
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-09-26 10:50:20 -0400
committerScott Moser <smoser@ubuntu.com>2013-09-26 10:50:20 -0400
commit356f5f434d3712fbfddc09d614eedfdb6ebe63a4 (patch)
treed32b28b317794817f080e463ae7c1e08c8e885c0 /systemd
parentb55a9606e9455056a4280b06ef3785964af6d3df (diff)
parent4063358ec2f20bcff4328fb659cecbed668a9a48 (diff)
downloadvyos-cloud-init-356f5f434d3712fbfddc09d614eedfdb6ebe63a4.tar.gz
vyos-cloud-init-356f5f434d3712fbfddc09d614eedfdb6ebe63a4.zip
merge from trunk
Diffstat (limited to 'systemd')
-rw-r--r--systemd/cloud-config.service2
-rw-r--r--systemd/cloud-final.service2
-rw-r--r--systemd/cloud-init-local.service2
-rw-r--r--systemd/cloud-init.service2
4 files changed, 4 insertions, 4 deletions
diff --git a/systemd/cloud-config.service b/systemd/cloud-config.service
index fc72fc48..41a86147 100644
--- a/systemd/cloud-config.service
+++ b/systemd/cloud-config.service
@@ -11,7 +11,7 @@ RemainAfterExit=yes
TimeoutSec=0
# Output needs to appear in instance console output
-StandardOutput=tty
+StandardOutput=journal+console
[Install]
WantedBy=multi-user.target
diff --git a/systemd/cloud-final.service b/systemd/cloud-final.service
index f836eab6..ef0f52b9 100644
--- a/systemd/cloud-final.service
+++ b/systemd/cloud-final.service
@@ -11,7 +11,7 @@ RemainAfterExit=yes
TimeoutSec=0
# Output needs to appear in instance console output
-StandardOutput=tty
+StandardOutput=journal+console
[Install]
WantedBy=multi-user.target
diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service
index 6a551710..a31985c6 100644
--- a/systemd/cloud-init-local.service
+++ b/systemd/cloud-init-local.service
@@ -10,7 +10,7 @@ RemainAfterExit=yes
TimeoutSec=0
# Output needs to appear in instance console output
-StandardOutput=tty
+StandardOutput=journal+console
[Install]
WantedBy=multi-user.target
diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service
index d4eb9fa5..018a1fa8 100644
--- a/systemd/cloud-init.service
+++ b/systemd/cloud-init.service
@@ -11,7 +11,7 @@ RemainAfterExit=yes
TimeoutSec=0
# Output needs to appear in instance console output
-StandardOutput=tty
+StandardOutput=journal+console
[Install]
WantedBy=multi-user.target