From 499159319d66df5039111bf4a0f731ebe71befcacafc55141bb97eda4fc6462c Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Mon, 7 Jul 2014 17:23:27 +0000 Subject: [PATCH] - fix "typo" the rhel_util module is imported as rhutil, use the proper name when accessing (modifies suseIntegratedHandler.patch) OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=18 --- cloud-init.changes | 6 ++++++ suseIntegratedHandler.patch | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cloud-init.changes b/cloud-init.changes index d6a8216..ffeb7a5 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -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 diff --git a/suseIntegratedHandler.patch b/suseIntegratedHandler.patch index d1f9c53..be384c2 100644 --- a/suseIntegratedHandler.patch +++ b/suseIntegratedHandler.patch @@ -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 +