Merge branch 'development'

GoogleCloudPlatform · Dec 13, 2017 · 1b4fcb3 · 1b4fcb3
2 parents 7bda006 + 31d9b1f
commit 1b4fcb3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git 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
@@ -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
@@ -0,0 +1,2 @@
+# Force IPv4 for Apt.
+Acquire::ForceIPv4 "true";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Force IPv4 for Apt.
		Acquire::ForceIPv4 "true";