diff options
author | Ben Howard <ben.howard@ubuntu.com> | 2012-12-07 16:52:42 -0700 |
---|---|---|
committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2012-12-12 17:03:27 +0000 |
commit | ce82ffdafaeeeeb4dae2024a32ae7488901b0627 (patch) | |
tree | 1d65382b4a57dd757c9f00cd937476e093af9a91 /debian/patches/001-strip-init-d.patch | |
parent | d688968c7ce20c06506c1b1da60a9cc9e98e2ee9 (diff) | |
parent | 6b49265dcb38dbd2b7be6cf311f6c4807d36abb1 (diff) | |
download | vyos-walinuxagent-ce82ffdafaeeeeb4dae2024a32ae7488901b0627.tar.gz vyos-walinuxagent-ce82ffdafaeeeeb4dae2024a32ae7488901b0627.zip |
Import patches-applied version 1.2-0ubuntu1 to applied/ubuntu/raring-proposed
Imported using git-ubuntu import.
Changelog parent: d688968c7ce20c06506c1b1da60a9cc9e98e2ee9
Unapplied parent: 6b49265dcb38dbd2b7be6cf311f6c4807d36abb1
New changelog entries:
* New upstream version (LP: #1077148)
* Upstream features:
- Added - load ata_piix.ko module loaded if needed for CDROM device support
- Additional logging for DoDhcpWork()
- Update sock.recv timeout from 30 to 10 seconds
- Fix: Linux waagent deprovision, user is not deleted properly
- Fix: Make LBProbeResponder construction more robust
- Fix: Agent fails to provision user with public/private key pairs
- Fix: DHCP broadcast response not received
- Fix: Linux agent fails to delete root user password
- Fix: Linux agent should report error messages to Fabric when
passed an invalid hostname.
* Dropped Ubuntu specific patches
- Removed debian/patches/000_resolv-conf.patch as upstream now supports
resolvconf properly.
- Removed debian/patches/001-strip-init-d.patch as redundant now that
upstream understands Ubuntu upstart. Upstream script does not
handle the removal of the upstart job anyway.
* Added debian/patches/000_use_package_upstart.patch to use packaged
upstart job over in-script upstart.
Diffstat (limited to 'debian/patches/001-strip-init-d.patch')
-rw-r--r-- | debian/patches/001-strip-init-d.patch | 36 |
1 files changed, 0 insertions, 36 deletions
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") |