diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2016-02-08 16:33:07 -0700 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2016-02-09 00:59:05 +0000 |
| commit | a00729ff7421b3661e8b1a1e0fa46393379f2e96 (patch) | |
| tree | 4563b927e3a57446a4a928a72a92d72c9ad4f6e6 /debian/patches/disable_udev_overrides.patch | |
| parent | 53f54030cae2de3d5fa474a61fe51f16c7a07c79 (diff) | |
| download | vyos-walinuxagent-a00729ff7421b3661e8b1a1e0fa46393379f2e96.tar.gz vyos-walinuxagent-a00729ff7421b3661e8b1a1e0fa46393379f2e96.zip | |
Import patches-unapplied version 2.1.3-0ubuntu1 to ubuntu/xenial-proposed
Imported using git-ubuntu import.
Changelog parent: 53f54030cae2de3d5fa474a61fe51f16c7a07c79
New changelog entries:
* New upstream release (LP: #1543359):
- Bug fixes for extension handling
- Feature enablement for AzureStack.
Diffstat (limited to 'debian/patches/disable_udev_overrides.patch')
| -rw-r--r-- | debian/patches/disable_udev_overrides.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/debian/patches/disable_udev_overrides.patch b/debian/patches/disable_udev_overrides.patch new file mode 100644 index 0000000..e0bb607 --- /dev/null +++ b/debian/patches/disable_udev_overrides.patch @@ -0,0 +1,37 @@ +--- a/bin/waagent2.0 ++++ b/bin/waagent2.0 +@@ -95,8 +95,7 @@ + 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 +--- a/azurelinuxagent/distro/ubuntu/osutil.py ++++ b/azurelinuxagent/distro/ubuntu/osutil.py +@@ -44,6 +44,12 @@ + 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 @@ + 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 |