debian/changelog

+google-compute-image-packages (20190124-2) unstable; urgency=medium
+
+  * Disable patches that are leading to breakages in GCE
+  * Install the journald config file to redirect logs to console
+
+ -- Lucas Kanashiro <lucas.kanashiro@collabora.com>  Wed, 06 Mar 2019 14:49:53 -0300
+
 google-compute-image-packages (20190124-1) unstable; urgency=medium
 
   * New upstream version 20190124

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/0002-Add-python3-support-to-write-content-in-a-file.patch

-From: Lucas Kanashiro <lucas.kanashiro@collabora.com>
-Date: Thu, 3 Jan 2019 11:06:02 -0200
-Subject: Add python3 support to write content in a file
-
-Using python 3, the content returned by the urlrequest are bytes instead of
-string. In order to write the content in a file the binary mode was added.
----
- google_compute_engine/metadata_scripts/script_retriever.py            | 2 +-
- google_compute_engine/metadata_scripts/tests/script_retriever_test.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/google_compute_engine/metadata_scripts/script_retriever.py
-+++ b/google_compute_engine/metadata_scripts/script_retriever.py
-@@ -86,7 +86,7 @@ class ScriptRetriever(object):
-       self.logger.warning('Could not download %s. %s.', url, str(e))
-       return None
- 
--    with open(dest, 'w') as f:
-+    with open(dest, 'wb') as f:
-       f.write(content)
- 
-     return dest
---- a/google_compute_engine/metadata_scripts/tests/script_retriever_test.py
-+++ b/google_compute_engine/metadata_scripts/tests/script_retriever_test.py
-@@ -63,7 +63,7 @@ class ScriptRetrieverTest(unittest.TestC
-     urlopen_read = mock_urlopen().read(return_value=b'foo').decode()
-     self.mock_logger.warning.assert_not_called()
- 
--    mock_open.assert_called_once_with(self.dest, 'w')
-+    mock_open.assert_called_once_with(self.dest, 'wb')
-     handle = mock_open()
-     handle.write.assert_called_once_with(urlopen_read)
- 

debian/patches/series

 0004-Remove-WantedBy-sshd-from-instance-setup.patch
-0002-Add-python3-support-to-write-content-in-a-file.patch
 0003-Disable-boto-by-default.patch
-0004-Write-daemon-output-to-kernel-log-and-console.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