diff options
| author | Zach Marano <zmarano@google.com> | 2017-12-13 15:47:59 -0800 |
|---|---|---|
| committer | Zach Marano <zmarano@google.com> | 2017-12-13 15:47:59 -0800 |
| commit | 1b4fcb39b471dc04a2efc70b5644c4f0f6de3e11 (patch) | |
| tree | 77cce45ae63c9287f164c290e43640a2a38ee7a7 | |
| parent | 7bda006b326a3cfe951e3947fcc64c280b8a6a3d (diff) | |
| parent | 31d9b1f94c87cd9b459e5a577277faf1876998cb (diff) | |
| download | google-compute-image-packages-1b4fcb39b471dc04a2efc70b5644c4f0f6de3e11.tar.gz | |
Merge branch 'development'20171213
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/google-compute-engine.install | 1 | ||||
| -rw-r--r-- | google_config/apt/99ipv4-only | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index c4bea8b..0a20f07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +google-compute-image-packages (2.7.2-2) stable; urgency=low + + * Force IPv4 for apt. + + -- Google Cloud Team <gc-team@google.com> Wed, 13 Dec 2017 12:00:00 -0700 + google-compute-image-packages (2.7.2-1) stable; urgency=low * Generate SSH host keys when none are present. diff --git a/debian/google-compute-engine.install b/debian/google-compute-engine.install index e9dfb6c..2617de5 100644 --- a/debian/google-compute-engine.install +++ b/debian/google-compute-engine.install @@ -1,6 +1,7 @@ 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/apt/01autoremove-gce etc/apt/apt.conf.d +google_config/apt/99ipv4-only etc/apt/apt.conf.d google_config/bin/google_set_hostname etc/dhcp/dhclient-exit-hooks.d google_config/rsyslog/* etc/rsyslog.d google_config/sysctl/* etc/sysctl.d diff --git a/google_config/apt/99ipv4-only b/google_config/apt/99ipv4-only new file mode 100644 index 0000000..efca3b6 --- /dev/null +++ b/google_config/apt/99ipv4-only @@ -0,0 +1,2 @@ +# Force IPv4 for Apt. +Acquire::ForceIPv4 "true"; |