diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/000_resolv-conf.patch | 32 | ||||
| -rw-r--r-- | debian/patches/000_use_package_upstart.patch | 16 | ||||
| -rw-r--r-- | debian/patches/001-strip-init-d.patch | 36 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
4 files changed, 17 insertions, 70 deletions
diff --git a/debian/patches/000_resolv-conf.patch b/debian/patches/000_resolv-conf.patch deleted file mode 100644 index 23404da..0000000 --- a/debian/patches/000_resolv-conf.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: wa-new/waagent -=================================================================== ---- wa-new.orig/waagent 2012-11-14 11:06:12.227371000 -0700 -+++ wa-new/waagent 2012-11-14 11:07:53.093401274 -0700 -@@ -2262,7 +2262,26 @@ - Run("rm -f " + a + "/*") - - # Clear LibDir, remove nameserver and root bash history -- for f in os.listdir(LibDir) + ["/etc/resolv.conf", "/root/.bash_history", "/var/log/waagent.log"]: -+ fileBlackList = [ "/root/.bash_history", "/var/log/waagent.log" ] -+ -+ if IsUbuntu(): -+ # Ubuntu uses resolv.conf by default, so removing /etc/resolv.conf will -+ # break resolvconf. Therefore, we check to see if resolvconf is in use, -+ # and if so, we remove the resolvconf artifacts. -+ -+ if os.path.realpath('/etc/resolv.conf') != '/run/resolvconf/resolv.conf': -+ Log("resolvconf is not configured. Removing /etc/resolv.conf") -+ fileBlackList.append('/etc/resolv.conf') -+ else: -+ Log("resolvconf is enabled; leaving /etc/resolv.conf intact") -+ resolvConfD = '/etc/resolvconf/resolv.conf.d/' -+ fileBlackList.extend([resolvConfD + 'tail', resolvConfD + 'originial' ]) -+ else: -+ fileBlackList.append(os.listdir(LibDir) + '/etc/resolv.conf') -+ -+ -+ # Clear LibDir, remove nameserver and root bash history -+ for f in os.listdir(LibDir) + fileBlackList: - try: - os.remove(f) - except: diff --git a/debian/patches/000_use_package_upstart.patch b/debian/patches/000_use_package_upstart.patch new file mode 100644 index 0000000..dce93cd --- /dev/null +++ b/debian/patches/000_use_package_upstart.patch @@ -0,0 +1,16 @@ +--- a/waagent ++++ b/waagent +@@ -2242,11 +2242,8 @@ def Install(): + Warn("Moved " + a + " -> " + LibDir + "/" + GetLastPathElement(a) ) + + if IsUbuntu(): +- # Support for Ubuntu's upstart configuration +- filename="waagent.conf" +- filepath = "/etc/init/" + filename +- SetFileContents(filepath, Init_Ubuntu) +- os.chmod(filepath, 0644) ++ # Use the Ubuntu packaged upstart job. ++ Log("Using Ubuntu packaged upstart job. Skipping upstart installation") + + else: + # Regular init.d configurations diff --git a/debian/patches/001-strip-init-d.patch b/debian/patches/001-strip-init-d.patch deleted file mode 100644 index 0d88fe4..0000000 --- a/debian/patches/001-strip-init-d.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/waagent -+++ b/waagent -@@ -2141,18 +2141,21 @@ def Install(): - os.remove(GetLastPathElement(a)) - shutil.move(a, ".") - Warn("Moved " + a + " -> " + LibDir + "/" + GetLastPathElement(a) ) -- filename = "waagent" -- filepath = "/etc/init.d/" + filename -- distro = IsRedHat() + IsDebian() * 2 + IsSuse() * 3 -- if distro == 0: -- Error("Unable to detect Linux Distribution.") -- return 1 -- init = [[Init_RedHat, "chkconfig --add " + filename], -- [Init_Debian, "update-rc.d " + filename + " defaults"], -- [Init_Suse, "insserv " + filename]][distro - 1] -- SetFileContents(filepath, init[0]) -- os.chmod(filepath, 0755) -- Run(init[1]) -+ -+ if not IsUbuntu(): -+ filename = "waagent" -+ filepath = "/etc/init.d/" + filename -+ distro = IsRedHat() + IsDebian() * 2 + IsSuse() * 3 -+ if distro == 0: -+ Error("Unable to detect Linux Distribution.") -+ return 1 -+ init = [[Init_RedHat, "chkconfig --add " + filename], -+ [Init_Debian, "update-rc.d " + filename + " defaults"], -+ [Init_Suse, "insserv " + filename]][distro - 1] -+ SetFileContents(filepath, init[0]) -+ os.chmod(filepath, 0755) -+ Run(init[1]) -+ - if os.path.isfile("/etc/waagent.conf"): - try: - os.remove("/etc/waagent.conf.old") diff --git a/debian/patches/series b/debian/patches/series index 96a325a..fb42aae 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -000_resolv-conf.patch -001-strip-init-d.patch +000_use_package_upstart.patch |