diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2013-06-11 14:09:58 -0600 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2013-07-02 14:33:26 +0000 |
| commit | 6cf5a13dd65bc0abf70a3874f11d5b61b26dce2b (patch) | |
| tree | b46497d67f1a8a6e1e7ec557b5d182b6cee30134 /debian | |
| parent | 571bdcfe4b3d37c0fc94689d511712c2a0a13b69 (diff) | |
| download | vyos-walinuxagent-6cf5a13dd65bc0abf70a3874f11d5b61b26dce2b.tar.gz vyos-walinuxagent-6cf5a13dd65bc0abf70a3874f11d5b61b26dce2b.zip | |
Import patches-unapplied version 1.3.2-0ubuntu2 to ubuntu/saucy-proposed
Imported using git-ubuntu import.
Changelog parent: 571bdcfe4b3d37c0fc94689d511712c2a0a13b69
New changelog entries:
* Added logic to prevent udev rules.d movement (LP: #1188753)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/000_no_udev_rule_removal.patch | 42 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 49 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index ba17763..a183fc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +walinuxagent (1.3.2-0ubuntu2) saucy; urgency=low + + * Added logic to prevent udev rules.d movement (LP: #1188753) + + -- Ben Howard <ben.howard@ubuntu.com> Tue, 11 Jun 2013 14:09:58 -0600 + walinuxagent (1.3.2-0ubuntu1) raring; urgency=low * Updated to 1.3.2 as part of Windows Azure requirement (LP: #1158465). diff --git a/debian/patches/000_no_udev_rule_removal.patch b/debian/patches/000_no_udev_rule_removal.patch new file mode 100644 index 0000000..40a10d0 --- /dev/null +++ b/debian/patches/000_no_udev_rule_removal.patch @@ -0,0 +1,42 @@ +--- a/waagent ++++ b/waagent +@@ -701,12 +701,13 @@ class EnvMonitor(object): + dhcpcmd = "pidof dhclient3" + dhcppid = RunGetOutput(dhcpcmd,chk_err=False)[1] + while not self.shutdown: +- for a in RulesFiles: +- if os.path.isfile(a): +- if os.path.isfile(GetLastPathElement(a)): +- os.remove(GetLastPathElement(a)) +- shutil.move(a, ".") +- Log("EnvMonitor: Moved " + a + " -> " + LibDir) ++ if not IsDebian(): ++ for a in RulesFiles: ++ if os.path.isfile(a): ++ if os.path.isfile(GetLastPathElement(a)): ++ os.remove(GetLastPathElement(a)) ++ shutil.move(a, ".") ++ Log("EnvMonitor: Moved " + a + " -> " + LibDir) + if publish != None and publish.lower().startswith("y"): + try: + if socket.gethostname() != self.HostName: +@@ -2318,12 +2319,13 @@ def Install(): + if UsesDpkg() and not Run("dpkg-query -s network-manager >/dev/null 2>&1",chk_err=False): # We want this to fail - supress error logging on error. + Error(GuestAgentLongName + " is not compatible with network-manager.") + return 1 +- for a in RulesFiles: +- if os.path.isfile(a): +- if os.path.isfile(GetLastPathElement(a)): +- os.remove(GetLastPathElement(a)) +- shutil.move(a, ".") +- Warn("Moved " + a + " -> " + LibDir + "/" + GetLastPathElement(a) ) ++ if not IsDebian(): ++ for a in RulesFiles: ++ if os.path.isfile(a): ++ if os.path.isfile(GetLastPathElement(a)): ++ os.remove(GetLastPathElement(a)) ++ shutil.move(a, ".") ++ Warn("Moved " + a + " -> " + LibDir + "/" + GetLastPathElement(a) ) + + if IsUbuntu() and not IsPackagedUbuntu(): + # Support for Ubuntu's upstart configuration diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..92e4a67 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +000_no_udev_rule_removal.patch |