pool/cloud-init
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fix "typo" the rhel_util module is imported as rhutil, use the

Browse Source 
proper name when accessing (modifies suseIntegratedHandler.patch)

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=18
This commit is contained in:
Robert Schweikert 2014-07-07 17:23:27 +00:00 committed by Git OBS Bridge
parent 1eec3d9f4b
commit 499159319d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cloud-init.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jul 7 17:21:54 UTC 2014 - rschweikert@suse.com
- fix "typo" the rhel_util module is imported as rhutil, use the
proper name when accessing (modifies suseIntegratedHandler.patch)
-------------------------------------------------------------------
Thu Jun 26 18:53:21 UTC 2014 - rschweikert@suse.com

6
suseIntegratedHandler.patch
View File

@ -105,7 +105,7 @@
+ clock_cfg = {
+ 'TIMEZONE': str(tz),
+ }
+ rhel_util.update_sysconfig_file(self.clock_conf_fn, clock_cfg)
+ rhutil.update_sysconfig_file(self.clock_conf_fn, clock_cfg)
+ # This ensures that the correct tz will be used for the system
+ util.copy(tz_file, self.tz_local_fn)
+
@ -196,13 +196,13 @@
+ net_cfg['ETHTOOL_OPTIONS'] = ''
+ else:
+ net_cfg['FIREWALL'] = 'no'
+ rhel_util.update_sysconfig_file(net_fn, net_cfg, True)
+ rhutil.update_sysconfig_file(net_fn, net_cfg, True)
+ if 'dns-nameservers' in info:
+ nameservers.extend(info['dns-nameservers'])
+ if 'dns-search' in info:
+ searchservers.extend(info['dns-search'])
+ if nameservers or searchservers:
+ rhel_util.update_resolve_conf_file(self.resolve_conf_fn,
+ rhutil.update_resolve_conf_file(self.resolve_conf_fn,
+ nameservers, searchservers)
+ return dev_names
+