diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/docs | 4 | ||||
| -rw-r--r-- | debian/patches/disable-udev-rules-removal.patch | 12 | ||||
| -rw-r--r-- | debian/patches/disable_import_test.patch | 21 | ||||
| -rw-r--r-- | debian/patches/disable_rhel_tests.patch | 13 | ||||
| -rw-r--r-- | debian/patches/disable_udev_overrides.patch | 37 | ||||
| -rw-r--r-- | debian/patches/series | 3 | ||||
| -rwxr-xr-x | debian/rules | 4 |
8 files changed, 53 insertions, 49 deletions
diff --git a/debian/changelog b/debian/changelog index 0434259..8c6cf59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +walinuxagent (2.1.3-0ubuntu1) xenial; urgency=medium + + * New upstream release (LP: #1543359): + - Bug fixes for extension handling + - Feature enablement for AzureStack. + + -- Ben Howard <ben.howard@ubuntu.com> Mon, 08 Feb 2016 16:33:07 -0700 + walinuxagent (2.1.2-0ubuntu2) xenial; urgency=medium * Added udev rule to give verbose logging on the serial console. diff --git a/debian/docs b/debian/docs index 56b0555..c401623 100644 --- a/debian/docs +++ b/debian/docs @@ -1,4 +1,6 @@ debian/99-cloud-init-disable-diskprovisioning.conf NOTICE LICENSE-2.0.txt -README +README.md +MANIFEST +Changelog diff --git a/debian/patches/disable-udev-rules-removal.patch b/debian/patches/disable-udev-rules-removal.patch deleted file mode 100644 index 3f3adfb..0000000 --- a/debian/patches/disable-udev-rules-removal.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/azurelinuxagent/distro/ubuntu/osutil.py -+++ b/azurelinuxagent/distro/ubuntu/osutil.py -@@ -44,6 +44,9 @@ - def start_agent_service(self): - return shellutil.run("service walinuxagent start", chk_err=False) - -+ def remove_rules_files(self, *args): -+ return -+ - class Ubuntu1204OSUtil(Ubuntu14xOSUtil): - def __init__(self): - super(Ubuntu1204OSUtil, self).__init__() diff --git a/debian/patches/disable_import_test.patch b/debian/patches/disable_import_test.patch index f7e6b64..cf3d167 100644 --- a/debian/patches/disable_import_test.patch +++ b/debian/patches/disable_import_test.patch @@ -1,20 +1,3 @@ ---- a/tests/test_import_waagent.py -+++ b/tests/test_import_waagent.py -@@ -28,13 +28,7 @@ - - class TestImportWAAgent(unittest.TestCase): - def test_import_waagent(self): -- agent_path = os.path.join(tools.parent, 'bin/waagent') -- if sys.version_info[0] == 2: -- waagent = imp.load_source('waagent', agent_path) -- self.assertNotEquals(None, waagent.LoggerInit) -- else: -- self.assertRaises(ImportError, imp.load_source, 'waagent', -- agent_path) -+ pass - - if __name__ == '__main__': - unittest.main() --- a/config/waagent.conf +++ b/config/waagent.conf @@ -14,13 +14,13 @@ @@ -34,8 +17,8 @@ # Supported values are "rsa", "dsa" and "ecdsa". Provisioning.SshHostKeyPairType=rsa -@@ -41,14 +41,14 @@ - #Provisioning.PasswordCryptSaltLength=10 +@@ -44,14 +44,14 @@ + Provisioning.AllowResetSysUser=n # Format if unformatted. If 'n', resource disk will not be mounted. -ResourceDisk.Format=y diff --git a/debian/patches/disable_rhel_tests.patch b/debian/patches/disable_rhel_tests.patch deleted file mode 100644 index f815ffe..0000000 --- a/debian/patches/disable_rhel_tests.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/tests/test_redhat.py -+++ b/tests/test_redhat.py -@@ -41,9 +41,7 @@ - - class TestRedhat(unittest.TestCase): - def test_RsaPublicKeyToSshRsa(self): -- OSUtil = RedhatOSUtil() -- ssh_rsa_pubkey = OSUtil.asn1_to_ssh_rsa(test_pubkey) -- self.assertEquals(expected_ssh_rsa_pubkey, ssh_rsa_pubkey) -+ pass - - if __name__ == '__main__': - unittest.main() 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 diff --git a/debian/patches/series b/debian/patches/series index d32f0ed..05993c8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ cloud-init-default-cfg.patch -disable-udev-rules-removal.patch -disable_rhel_tests.patch disable_import_test.patch +disable_udev_overrides.patch diff --git a/debian/rules b/debian/rules index 06d0f8c..8ec7cb1 100755 --- a/debian/rules +++ b/debian/rules @@ -5,8 +5,8 @@ ORIG_SRC=https://github.com/WindowsAzure/WALinuxAgent get-packaged-orig-source: git clone --separate-git-dir=walinuxagent.checkout \ $(ORIG_SRC) orig_source - git checkout -b tags/$(DEB_VERSION) - git archive --format=tar.gz WALinuxAgent-$(DEB_VERSION) \ + git checkout -b tags/v$(DEB_VERSION) + git archive --format=tar.gz v$(DEB_VERSION) \ -o walinuxagent_$(DEB_VERSION).orig.tar.gz rm -rf walinuxagent.checkout rm -rf orig_source |