Attachment #191876 for bug #227006

View | Details | Raw Unified | Return to bug 227006
Collapse All | Expand All

Lines 1-7 Link Here

(-)py-google-compute-engine-2.7.6/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= google-compute-engine	3	PORTNAME= google-compute-engine
4	PORTVERSION= 2.6.1	4	PORTVERSION= 2.7.6
5	CATEGORIES= sysutils python	5	CATEGORIES= sysutils python
6	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-3 Link Here

(-)py-google-compute-engine-2.7.6/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1506375280	1	TIMESTAMP = 1522049559
2	SHA256 (google-compute-engine-2.6.1.tar.gz) = e1df14f755dfa8f165b7bde77b9ed0c18cc32c41a7eb4bf97bc73f0bb65e541f	2	SHA256 (google-compute-engine-2.7.6.tar.gz) = 23c764f2fc72db5a0b81cb8f8029c4e5d152bd50faf1eb7322b4a4cff039d003
3	SIZE (google-compute-engine-2.6.1.tar.gz) = 29562	3	SIZE (google-compute-engine-2.7.6.tar.gz) = 40742

Lines 1-4 Link Here

(-)py-google-compute-engine-2.7.6/files/patch-google__compute__engine_clock__skew_clock__skew__daemon.py (-1 / +1 lines)
1	--- google_compute_engine/clock_skew/clock_skew_daemon.py.orig 2017-09-14 18:08:49 UTC	1	--- google_compute_engine/clock_skew/clock_skew_daemon.py.orig 2018-02-22 19:44:17 UTC
2	+++ google_compute_engine/clock_skew/clock_skew_daemon.py	2	+++ google_compute_engine/clock_skew/clock_skew_daemon.py
3	@@ -59,9 +59,12 @@ class ClockSkewDaemon(object):	3	@@ -59,9 +59,12 @@ class ClockSkewDaemon(object):
4	response: string, the metadata response with the new drift token value.	4	response: string, the metadata response with the new drift token value.

Lines 1-9 Link Here

(-)py-google-compute-engine-2.7.6/files/patch-google__compute__engine_instance__setup_instance__config.py (-3 / +3 lines)
1	--- google_compute_engine/instance_setup/instance_config.py.orig 2017-09-29 00:21:28 UTC	1	--- google_compute_engine/instance_setup/instance_config.py.orig 2018-02-22 19:44:17 UTC
2	+++ google_compute_engine/instance_setup/instance_config.py	2	+++ google_compute_engine/instance_setup/instance_config.py
3	@@ -72,11 +72,11 @@ class InstanceConfig(config_manager.Conf	3	@@ -73,11 +73,11 @@ class InstanceConfig(config_manager.Conf
4	'instance_id': '0',
5	},	4	},
6	'InstanceSetup': {	5	'InstanceSetup': {
		6	'host_key_types': 'ecdsa,ed25519,rsa',
7	- 'optimize_local_ssd': 'true',	7	- 'optimize_local_ssd': 'true',
8	+ 'optimize_local_ssd': 'false',	8	+ 'optimize_local_ssd': 'false',
9	'network_enabled': 'true',	9	'network_enabled': 'true',

Lines 1-6 Link Here

(-)py-google-compute-engine-2.7.6/files/patch-google__compute__engine_instance__setup_instance__setup.py (-2 / +2 lines)
1	--- google_compute_engine/instance_setup/instance_setup.py.orig 2017-09-14 18:08:49 UTC	1	--- google_compute_engine/instance_setup/instance_setup.py.orig 2018-02-22 19:44:17 UTC
2	+++ google_compute_engine/instance_setup/instance_setup.py	2	+++ google_compute_engine/instance_setup/instance_setup.py
3	@@ -146,12 +146,12 @@ class InstanceSetup(object):	3	@@ -147,12 +147,12 @@ class InstanceSetup(object):
4	# Instance setup systemd scripts block sshd from starting.	4	# Instance setup systemd scripts block sshd from starting.
5	if os.path.exists(constants.LOCALBASE + '/bin/systemctl'):	5	if os.path.exists(constants.LOCALBASE + '/bin/systemctl'):
6	return	6	return

Lines 1-6 Link Here

(-)py-google-compute-engine-2.7.6/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__daemon.py (-2 / +2 lines)
1	--- google_compute_engine/ip_forwarding/ip_forwarding_daemon.py.orig 2017-09-14 18:08:49 UTC	1	--- google_compute_engine/ip_forwarding/ip_forwarding_daemon.py.orig 2018-02-22 19:44:17 UTC
2	+++ google_compute_engine/ip_forwarding/ip_forwarding_daemon.py	2	+++ google_compute_engine/ip_forwarding/ip_forwarding_daemon.py
3	@@ -137,20 +137,20 @@ class IpForwardingDaemon(object):	3	@@ -136,20 +136,20 @@ class IpForwardingDaemon(object):
4	Args:	4	Args:
5	result: dict, the metadata response with the new network interfaces.	5	result: dict, the metadata response with the new network interfaces.
6	"""	6	"""

Lines 1-4 Link Here

(-)py-google-compute-engine-2.7.6/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__utils.py (-1 / +1 lines)
1	--- google_compute_engine/ip_forwarding/ip_forwarding_utils.py.orig 2017-09-14 18:08:49 UTC	1	--- google_compute_engine/ip_forwarding/ip_forwarding_utils.py.orig 2018-02-22 19:44:17 UTC
2	+++ google_compute_engine/ip_forwarding/ip_forwarding_utils.py	2	+++ google_compute_engine/ip_forwarding/ip_forwarding_utils.py
3	@@ -17,6 +17,8 @@	3	@@ -17,6 +17,8 @@
4		4




--- google_compute_engine/network_setup/network_setup.py.orig	2017-09-29 00:21:28 UTC
+++ google_compute_engine/network_setup/network_setup.py
@@ -107,12 +107,18 @@ class NetworkSetup(object):
     self.logger.info('Enabling the Ethernet interfaces %s.', interfaces)
     dhclient_command = ['dhclient']
     if os.path.exists(self.dhclient_script):
-      dhclient_command += ['-sf', self.dhclient_script]
-    try:
-      subprocess.check_call(dhclient_command + ['-x'] + interfaces)
-      subprocess.check_call(dhclient_command + interfaces)
-    except subprocess.CalledProcessError:
-      self.logger.warning('Could not enable interfaces %s.', interfaces)
+      dhclient_conf = '/etc/dhclient.conf'
+      if os.path.exists(dhclient_conf):
+        subprocess.call('sed -i "" "/^script/d" ' + dhclient_conf, shell=True)
+      subprocess.call('echo \'script "%s";\' >> %s' % (self.dhclient_script, dhclient_conf), shell=True)
+    for interface in interfaces:
+      try:
+        subprocess.check_call(['ifconfig', interface, 'down', 'delete'])
+        # wait previous dhclient to exit
+        subprocess.check_call(['sleep', '3'])
+        subprocess.check_call(dhclient_command + [interface])
+      except subprocess.CalledProcessError:
+        self.logger.warning('Could not enable interface %s.', interface)
 
   def _EnableNetworkInterfaces(self, interfaces):
     """Enable the list of network interfaces.

Lines 1-10 Link Here

(-)py-google-compute-engine-2.7.6/files/patch-setup.py (-3 / +3 lines)
1	--- setup.py.orig 2017-09-14 18:08:49 UTC	1	--- setup.py.orig 2018-02-22 19:44:17 UTC
2	+++ setup.py	2	+++ setup.py
3	@@ -30,7 +30,6 @@ setuptools.setup(	3	@@ -34,7 +34,6 @@ setuptools.setup(
4	long_description='Google Compute Engine guest environment.',	4	long_description='Google Compute Engine guest environment.',
5	name='google-compute-engine',	5	name='google-compute-engine',
6	packages=setuptools.find_packages(),	6	packages=setuptools.find_packages(),
7	- scripts=glob.glob('scripts/*'),	7	- scripts=glob.glob('scripts/*'),
8	url='https://github.com/GoogleCloudPlatform/compute-image-packages',	8	url='https://github.com/GoogleCloudPlatform/compute-image-packages',
9	version='2.6.1',	9	version='2.7.6',
10	# Entry points create scripts in /usr/bin that call a function.	10	# Entry points create scripts in /usr/bin that call a function.

Return to bug 227006

Lines 1-27 Link Here

(-)py-google-compute-engine-2.7.6/files/patch-google__compute__engine_network__setup_network__setup.py (-27 lines)
1	--- google_compute_engine/network_setup/network_setup.py.orig 2017-09-29 00:21:28 UTC
2	+++ google_compute_engine/network_setup/network_setup.py
3	@@ -107,12 +107,18 @@ class NetworkSetup(object):
4	self.logger.info('Enabling the Ethernet interfaces %s.', interfaces)
5	dhclient_command = ['dhclient']
6	if os.path.exists(self.dhclient_script):
7	- dhclient_command += ['-sf', self.dhclient_script]
8	- try:
9	- subprocess.check_call(dhclient_command + ['-x'] + interfaces)
10	- subprocess.check_call(dhclient_command + interfaces)
11	- except subprocess.CalledProcessError:
12	- self.logger.warning('Could not enable interfaces %s.', interfaces)
13	+ dhclient_conf = '/etc/dhclient.conf'
14	+ if os.path.exists(dhclient_conf):
15	+ subprocess.call('sed -i "" "/^script/d" ' + dhclient_conf, shell=True)
16	+ subprocess.call('echo \'script "%s";\' >> %s' % (self.dhclient_script, dhclient_conf), shell=True)
17	+ for interface in interfaces:
18	+ try:
19	+ subprocess.check_call(['ifconfig', interface, 'down', 'delete'])
20	+ # wait previous dhclient to exit
21	+ subprocess.check_call(['sleep', '3'])
22	+ subprocess.check_call(dhclient_command + [interface])
23	+ except subprocess.CalledProcessError:
24	+ self.logger.warning('Could not enable interface %s.', interface)
25
26	def _EnableNetworkInterfaces(self, interfaces):
27	"""Enable the list of network interfaces.