diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2016-02-18 12:26:24 -0800 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2016-02-18 21:08:54 +0000 |
| commit | b1bfbab61e8b6484e49984ae214fa4855f1b41d2 (patch) | |
| tree | 015fdc2d58182f9241a80809363804b9633852f4 | |
| parent | 358bb82027f04ba06688fe87e82c4d1f415e947a (diff) | |
| download | vyos-walinuxagent-b1bfbab61e8b6484e49984ae214fa4855f1b41d2.tar.gz vyos-walinuxagent-b1bfbab61e8b6484e49984ae214fa4855f1b41d2.zip | |
disable_udev_overrides.patch
No DEP3 Subject or Description header found
Gbp-Pq: disable_udev_overrides.patch.
| -rw-r--r-- | azurelinuxagent/distro/ubuntu/osutil.py | 12 | ||||
| -rw-r--r-- | bin/waagent2.0 | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/azurelinuxagent/distro/ubuntu/osutil.py b/azurelinuxagent/distro/ubuntu/osutil.py index cc4b8ef..5fdb2ed 100644 --- a/azurelinuxagent/distro/ubuntu/osutil.py +++ b/azurelinuxagent/distro/ubuntu/osutil.py @@ -44,6 +44,12 @@ class Ubuntu14OSUtil(DefaultOSUtil): def start_agent_service(self): return shellutil.run("service walinuxagent start", chk_err=False) + def remove_rules_files(self, rules_files=""): + pass + + def restore_rules_files(self, rules_files=""): + pass + class Ubuntu12OSUtil(Ubuntu14OSUtil): def __init__(self): super(Ubuntu12OSUtil, self).__init__() @@ -67,9 +73,3 @@ class UbuntuSnappyOSUtil(Ubuntu14OSUtil): def __init__(self): super(UbuntuSnappyOSUtil, self).__init__() self.conf_file_path = '/apps/walinuxagent/current/waagent.conf' - - def remove_rules_files(self, rules_files=""): - pass - - def restore_rules_files(self, rules_files=""): - pass diff --git a/bin/waagent2.0 b/bin/waagent2.0 index 673a04c..e946f1e 100644 --- a/bin/waagent2.0 +++ b/bin/waagent2.0 @@ -95,8 +95,7 @@ ExtensionChildren = [] VMM_STARTUP_SCRIPT_NAME='install' VMM_CONFIG_FILE_NAME='linuxosconfiguration.xml' global RulesFiles -RulesFiles = [ "/lib/udev/rules.d/75-persistent-net-generator.rules", - "/etc/udev/rules.d/70-persistent-net.rules" ] +RulesFiles = [ ] VarLibDhcpDirectories = ["/var/lib/dhclient", "/var/lib/dhcpcd", "/var/lib/dhcp"] EtcDhcpClientConfFiles = ["/etc/dhcp/dhclient.conf", "/etc/dhcp3/dhclient.conf"] global LibDir |