debian/changelog

+google-compute-image-packages (20190124-3) unstable; urgency=medium
+
+  * Apply patch to write daemons output to journal and console
+  * Do not install journald config to forward all logs to the
+    console (Closes: #923889)
+
+ -- Lucas Kanashiro <lucas.kanashiro@collabora.com>  Thu, 14 Mar 2019 16:05:48 -0300
+
 google-compute-image-packages (20190124-2) unstable; urgency=medium
 
   * Disable patches that are leading to breakages in GCE

debian/google-compute-engine.install

 google_compute_engine_init/systemd/*.service lib/systemd/system
 google_compute_engine_init/systemd/90-google-compute-engine.preset lib/systemd/system-preset
 google_config/bin/google_set_hostname etc/dhcp/dhclient-exit-hooks.d
-google_config/journald/* etc/systemd/journald.conf.d
 google_config/sysctl/* etc/sysctl.d
 google_config/udev/* lib/udev/rules.d

debian/patches/0005-Don-t-try-to-pull-in-unrelated-systemd-services.patch

@@ -12,7 +12,7 @@ Subject: Don't try to pull in unrelated systemd services
  6 files changed, 8 deletions(-)
 
 diff --git a/google_compute_engine_init/systemd/google-accounts-daemon.service b/google_compute_engine_init/systemd/google-accounts-daemon.service
-index 1f49134..94070b0 100644
+index f1d7111..4344536 100644
 --- a/google_compute_engine_init/systemd/google-accounts-daemon.service
 +++ b/google_compute_engine_init/systemd/google-accounts-daemon.service
 @@ -1,7 +1,6 @@
@@ -24,7 +24,7 @@ index 1f49134..94070b0 100644
  [Service]
  Type=simple
 diff --git a/google_compute_engine_init/systemd/google-clock-skew-daemon.service b/google_compute_engine_init/systemd/google-clock-skew-daemon.service
-index 68dfa67..5939233 100644
+index 71369f5..1893cc3 100644
 --- a/google_compute_engine_init/systemd/google-clock-skew-daemon.service
 +++ b/google_compute_engine_init/systemd/google-clock-skew-daemon.service
 @@ -1,7 +1,6 @@
@@ -36,7 +36,7 @@ index 68dfa67..5939233 100644
  [Service]
  Type=simple
 diff --git a/google_compute_engine_init/systemd/google-instance-setup.service b/google_compute_engine_init/systemd/google-instance-setup.service
-index 85001da..bbc4687 100644
+index e039696..7095479 100644
 --- a/google_compute_engine_init/systemd/google-instance-setup.service
 +++ b/google_compute_engine_init/systemd/google-instance-setup.service
 @@ -2,7 +2,6 @@
@@ -48,7 +48,7 @@ index 85001da..bbc4687 100644
  [Service]
  Type=oneshot
 diff --git a/google_compute_engine_init/systemd/google-network-daemon.service b/google_compute_engine_init/systemd/google-network-daemon.service
-index bc6d22e..c446d35 100644
+index 74bf82e..609067e 100644
 --- a/google_compute_engine_init/systemd/google-network-daemon.service
 +++ b/google_compute_engine_init/systemd/google-network-daemon.service
 @@ -2,9 +2,6 @@
@@ -62,7 +62,7 @@ index bc6d22e..c446d35 100644
  [Service]
  Type=simple
 diff --git a/google_compute_engine_init/systemd/google-shutdown-scripts.service b/google_compute_engine_init/systemd/google-shutdown-scripts.service
-index dcc7821..e2fe8bb 100644
+index 069405e..744586a 100644
 --- a/google_compute_engine_init/systemd/google-shutdown-scripts.service
 +++ b/google_compute_engine_init/systemd/google-shutdown-scripts.service
 @@ -2,7 +2,6 @@
@@ -74,7 +74,7 @@ index dcc7821..e2fe8bb 100644
  [Service]
  ExecStart=/bin/true
 diff --git a/google_compute_engine_init/systemd/google-startup-scripts.service b/google_compute_engine_init/systemd/google-startup-scripts.service
-index 25b6544..3d7138f 100644
+index 73ee8db..3bee171 100644
 --- a/google_compute_engine_init/systemd/google-startup-scripts.service
 +++ b/google_compute_engine_init/systemd/google-startup-scripts.service
 @@ -2,7 +2,6 @@

debian/patches/0004-Write-daemon-output-to-kernel-log-and-console.patch → debian/patches/0005-Write-daemons-output-to-journal-and-console.patch

-From: Bastian Blank <waldi@debian.org>
-Date: Wed, 30 Jan 2019 16:52:16 +0100
-Subject: Write daemon output to kernel log and console
+From: Lucas Kanashiro <lucas.kanashiro@collabora.com>
+Date: Thu, 14 Mar 2019 15:28:01 -0300
+Subject: Write daemons output to journal and console
 
 ---
  google_compute_engine_init/systemd/google-accounts-daemon.service   | 1 +
@@ -12,74 +12,74 @@ Subject: Write daemon output to kernel log and console
  6 files changed, 6 insertions(+)
 
 diff --git a/google_compute_engine_init/systemd/google-accounts-daemon.service b/google_compute_engine_init/systemd/google-accounts-daemon.service
-index f1d7111..1f49134 100644
+index 4344536..831e3ca 100644
 --- a/google_compute_engine_init/systemd/google-accounts-daemon.service
 +++ b/google_compute_engine_init/systemd/google-accounts-daemon.service
-@@ -6,6 +6,7 @@ Requires=network.target
+@@ -5,6 +5,7 @@ After=network.target google-instance-setup.service google-network-daemon.service
  [Service]
  Type=simple
  ExecStart=/usr/bin/google_accounts_daemon
-+StandardOutput=kmsg
++StandardOutput=journal+console
  
  [Install]
  WantedBy=multi-user.target
 diff --git a/google_compute_engine_init/systemd/google-clock-skew-daemon.service b/google_compute_engine_init/systemd/google-clock-skew-daemon.service
-index 71369f5..68dfa67 100644
+index 1893cc3..9339116 100644
 --- a/google_compute_engine_init/systemd/google-clock-skew-daemon.service
 +++ b/google_compute_engine_init/systemd/google-clock-skew-daemon.service
-@@ -6,6 +6,7 @@ Requires=network.target
+@@ -5,6 +5,7 @@ After=network.target google-instance-setup.service google-network-daemon.service
  [Service]
  Type=simple
  ExecStart=/usr/bin/google_clock_skew_daemon
-+StandardOutput=kmsg
++StandardOutput=journal+console
  
  [Install]
  WantedBy=multi-user.target
 diff --git a/google_compute_engine_init/systemd/google-instance-setup.service b/google_compute_engine_init/systemd/google-instance-setup.service
-index e039696..85001da 100644
+index c1b29db..c197f3e 100644
 --- a/google_compute_engine_init/systemd/google-instance-setup.service
 +++ b/google_compute_engine_init/systemd/google-instance-setup.service
-@@ -7,6 +7,7 @@ Wants=local-fs.target network-online.target network.target
+@@ -6,6 +6,7 @@ Before=sshd.service
  [Service]
  Type=oneshot
  ExecStart=/usr/bin/google_instance_setup
-+StandardOutput=kmsg
++StandardOutput=journal+console
  
  [Install]
  WantedBy=multi-user.target
 diff --git a/google_compute_engine_init/systemd/google-network-daemon.service b/google_compute_engine_init/systemd/google-network-daemon.service
-index 74bf82e..bc6d22e 100644
+index f411e05..1b6ba4b 100644
 --- a/google_compute_engine_init/systemd/google-network-daemon.service
 +++ b/google_compute_engine_init/systemd/google-network-daemon.service
-@@ -9,6 +9,7 @@ PartOf=network.service
+@@ -6,6 +6,7 @@ After=google-instance-setup.service
  [Service]
  Type=simple
  ExecStart=/usr/bin/google_network_daemon
-+StandardOutput=kmsg
++StandardOutput=journal+console
  
  [Install]
  WantedBy=multi-user.target
 diff --git a/google_compute_engine_init/systemd/google-shutdown-scripts.service b/google_compute_engine_init/systemd/google-shutdown-scripts.service
-index 069405e..dcc7821 100644
+index e43efa8..3db4d21 100644
 --- a/google_compute_engine_init/systemd/google-shutdown-scripts.service
 +++ b/google_compute_engine_init/systemd/google-shutdown-scripts.service
-@@ -10,6 +10,7 @@ ExecStop=/usr/bin/google_metadata_script_runner --script-type shutdown
+@@ -9,6 +9,7 @@ ExecStop=/usr/bin/google_metadata_script_runner --script-type shutdown
  Type=oneshot
  RemainAfterExit=true
  TimeoutStopSec=0
-+StandardOutput=kmsg
++StandardOutput=journal+console
  
  [Install]
  WantedBy=multi-user.target
 diff --git a/google_compute_engine_init/systemd/google-startup-scripts.service b/google_compute_engine_init/systemd/google-startup-scripts.service
-index 73ee8db..25b6544 100644
+index d74888f..0f8cf8b 100644
 --- a/google_compute_engine_init/systemd/google-startup-scripts.service
 +++ b/google_compute_engine_init/systemd/google-startup-scripts.service
-@@ -8,6 +8,7 @@ Wants=local-fs.target network-online.target network.target
+@@ -7,6 +7,7 @@ After=google-instance-setup.service google-network-daemon.service
  ExecStart=/usr/bin/google_metadata_script_runner --script-type startup
  KillMode=process
  Type=oneshot
-+StandardOutput=kmsg
++StandardOutput=journal+console
  
  [Install]
  WantedBy=multi-user.target

debian/patches/0006-Drop-stuff-included-in-default-dependencies.patch

@@ -10,7 +10,7 @@ Subject: Drop stuff included in default dependencies
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/google_compute_engine_init/systemd/google-instance-setup.service b/google_compute_engine_init/systemd/google-instance-setup.service
-index bbc4687..5b081eb 100644
+index 7095479..c1b29db 100644
 --- a/google_compute_engine_init/systemd/google-instance-setup.service
 +++ b/google_compute_engine_init/systemd/google-instance-setup.service
 @@ -1,6 +1,6 @@
@@ -22,7 +22,7 @@ index bbc4687..5b081eb 100644
  
  [Service]
 diff --git a/google_compute_engine_init/systemd/google-network-daemon.service b/google_compute_engine_init/systemd/google-network-daemon.service
-index c446d35..8eaa62d 100644
+index 609067e..f411e05 100644
 --- a/google_compute_engine_init/systemd/google-network-daemon.service
 +++ b/google_compute_engine_init/systemd/google-network-daemon.service
 @@ -1,6 +1,6 @@
@@ -34,7 +34,7 @@ index c446d35..8eaa62d 100644
  
  [Service]
 diff --git a/google_compute_engine_init/systemd/google-shutdown-scripts.service b/google_compute_engine_init/systemd/google-shutdown-scripts.service
-index e2fe8bb..a6d73dd 100644
+index 744586a..e43efa8 100644
 --- a/google_compute_engine_init/systemd/google-shutdown-scripts.service
 +++ b/google_compute_engine_init/systemd/google-shutdown-scripts.service
 @@ -1,6 +1,6 @@
@@ -46,7 +46,7 @@ index e2fe8bb..a6d73dd 100644
  
  [Service]
 diff --git a/google_compute_engine_init/systemd/google-startup-scripts.service b/google_compute_engine_init/systemd/google-startup-scripts.service
-index 3d7138f..a7e658a 100644
+index 3bee171..d74888f 100644
 --- a/google_compute_engine_init/systemd/google-startup-scripts.service
 +++ b/google_compute_engine_init/systemd/google-startup-scripts.service
 @@ -1,6 +1,6 @@

debian/patches/series

 0004-Remove-WantedBy-sshd-from-instance-setup.patch
 0003-Disable-boto-by-default.patch
-#0004-Write-daemon-output-to-kernel-log-and-console.patch
 0005-Don-t-try-to-pull-in-unrelated-systemd-services.patch
 0006-Drop-stuff-included-in-default-dependencies.patch
+0005-Write-daemons-output-to-journal-and-console.patch