diff options
author | Garrett Holmstrom <gholms@eucalyptus.com> | 2013-09-20 16:04:49 -0700 |
---|---|---|
committer | Garrett Holmstrom <gholms@eucalyptus.com> | 2013-09-20 16:04:49 -0700 |
commit | 4050105c1cfb100e6b93c56a74ecd2fe29d87608 (patch) | |
tree | 6fadc662546912cef83bef5ae7840a11e442274a /systemd | |
parent | 266d12c5777d5fba97c374c33cb4f31d50e2d347 (diff) | |
download | vyos-cloud-init-4050105c1cfb100e6b93c56a74ecd2fe29d87608.tar.gz vyos-cloud-init-4050105c1cfb100e6b93c56a74ecd2fe29d87608.zip |
Some containers lack /dev/console, so when multi_log attempts to open
that device and write to it directly things can start going haywire.
Here we address this problem by sending console-bound output to stdout
and letting init take care of getting it to the console instead.
We already configure upstart with "console output", so we need only
change systemd to use "journal+console".
Diffstat (limited to 'systemd')
-rw-r--r-- | systemd/cloud-config.service | 2 | ||||
-rw-r--r-- | systemd/cloud-final.service | 2 | ||||
-rw-r--r-- | systemd/cloud-init-local.service | 2 | ||||
-rw-r--r-- | systemd/cloud-init.service | 2 |
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 |