From e509d6821647aee2965c78bbfe8548a66a06ce0d Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Thu, 18 Feb 2016 12:26:24 -0800 Subject: Import patches-unapplied version 2.1.3-0ubuntu2 to ubuntu/xenial-proposed Imported using git-ubuntu import. Changelog parent: a00729ff7421b3661e8b1a1e0fa46393379f2e96 New changelog entries: * Fixed file shebangs to use python3. --- debian/changelog | 6 ++++++ debian/patches/fix_shebangs.patch | 24 ++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 31 insertions(+) create mode 100644 debian/patches/fix_shebangs.patch diff --git a/debian/changelog b/debian/changelog index 8c6cf59..4107d02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +walinuxagent (2.1.3-0ubuntu2) xenial; urgency=medium + + * Fixed file shebangs to use python3. + + -- Ben Howard Thu, 18 Feb 2016 12:26:24 -0800 + walinuxagent (2.1.3-0ubuntu1) xenial; urgency=medium * New upstream release (LP: #1543359): diff --git a/debian/patches/fix_shebangs.patch b/debian/patches/fix_shebangs.patch new file mode 100644 index 0000000..828b0f2 --- /dev/null +++ b/debian/patches/fix_shebangs.patch @@ -0,0 +1,24 @@ +--- a/setup.py ++++ b/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3n3n3 + # + # Microsoft Azure Linux Agent setup.py + # +--- a/bin/waagent ++++ b/bin/waagent +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # Azure Linux Agent + # +--- a/bin/waagent2.0 ++++ b/bin/waagent2.0 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # Azure Linux Agent + # diff --git a/debian/patches/series b/debian/patches/series index 05993c8..a2f35e0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ cloud-init-default-cfg.patch disable_import_test.patch disable_udev_overrides.patch +fix_shebangs.patch -- cgit v1.2.3 From 5d5387288ca111a65941df0953c127b9c1da6633 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Thu, 18 Feb 2016 12:26:24 -0800 Subject: cloud-init-default-cfg.patch No DEP3 Subject or Description header found Gbp-Pq: cloud-init-default-cfg.patch. --- config/91_walinuxagent.cfg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 config/91_walinuxagent.cfg diff --git a/config/91_walinuxagent.cfg b/config/91_walinuxagent.cfg new file mode 100644 index 0000000..b7049fc --- /dev/null +++ b/config/91_walinuxagent.cfg @@ -0,0 +1,3 @@ +# This configuration file is provided by the WALinuxAgent package. +datasource_list: [ Azure ] + -- cgit v1.2.3 From 358bb82027f04ba06688fe87e82c4d1f415e947a Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Thu, 18 Feb 2016 12:26:24 -0800 Subject: disable_import_test.patch No DEP3 Subject or Description header found Gbp-Pq: disable_import_test.patch. --- config/waagent.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/waagent.conf b/config/waagent.conf index e808117..d741734 100644 --- a/config/waagent.conf +++ b/config/waagent.conf @@ -14,13 +14,13 @@ Role.ConfigurationConsumer=None Role.TopologyConsumer=None # Enable instance creation -Provisioning.Enabled=y +Provisioning.Enabled=n # Password authentication for root account will be unavailable. -Provisioning.DeleteRootPassword=y +Provisioning.DeleteRootPassword=n # Generate fresh host key pair. -Provisioning.RegenerateSshHostKeyPair=y +Provisioning.RegenerateSshHostKeyPair=n # Supported values are "rsa", "dsa" and "ecdsa". Provisioning.SshHostKeyPairType=rsa @@ -44,14 +44,14 @@ Provisioning.ExecuteCustomData=n Provisioning.AllowResetSysUser=n # Format if unformatted. If 'n', resource disk will not be mounted. -ResourceDisk.Format=y +ResourceDisk.Format=n # File system on the resource disk # Typically ext3 or ext4. FreeBSD images should use 'ufs2' here. ResourceDisk.Filesystem=ext4 # Mount point for the resource disk -ResourceDisk.MountPoint=/mnt/resource +ResourceDisk.MountPoint=/mnt # Create and use swapfile on resource disk. ResourceDisk.EnableSwap=n -- cgit v1.2.3 From b1bfbab61e8b6484e49984ae214fa4855f1b41d2 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Thu, 18 Feb 2016 12:26:24 -0800 Subject: disable_udev_overrides.patch No DEP3 Subject or Description header found Gbp-Pq: disable_udev_overrides.patch. --- azurelinuxagent/distro/ubuntu/osutil.py | 12 ++++++------ bin/waagent2.0 | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/azurelinuxagent/distro/ubuntu/osutil.py b/azurelinuxagent/distro/ubuntu/osutil.py index cc4b8ef..5fdb2ed 100644 --- a/azurelinuxagent/distro/ubuntu/osutil.py +++ b/azurelinuxagent/distro/ubuntu/osutil.py @@ -44,6 +44,12 @@ class Ubuntu14OSUtil(DefaultOSUtil): 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 @@ class UbuntuSnappyOSUtil(Ubuntu14OSUtil): 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/bin/waagent2.0 b/bin/waagent2.0 index 673a04c..e946f1e 100644 --- a/bin/waagent2.0 +++ b/bin/waagent2.0 @@ -95,8 +95,7 @@ ExtensionChildren = [] 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 -- cgit v1.2.3 From 3a27f75e587dc171ba3a045b707ca616cd9e4c80 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Thu, 18 Feb 2016 12:26:24 -0800 Subject: fix_shebangs.patch No DEP3 Subject or Description header found Gbp-Pq: fix_shebangs.patch. --- bin/waagent | 2 +- bin/waagent2.0 | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/waagent b/bin/waagent index e65bc0c..03333c7 100755 --- a/bin/waagent +++ b/bin/waagent @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Azure Linux Agent # diff --git a/bin/waagent2.0 b/bin/waagent2.0 index e946f1e..b77d6ab 100644 --- a/bin/waagent2.0 +++ b/bin/waagent2.0 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Azure Linux Agent # diff --git a/setup.py b/setup.py index c799787..896528e 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3n3n3 # # Microsoft Azure Linux Agent setup.py # -- cgit v1.2.3