From 0f7cef5b52162d1ebb31a738bd8fc9febe1fbda6 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 7 Mar 2016 12:10:21 -0700 Subject: Import patches-unapplied version 2.1.3-0ubuntu4 to ubuntu/xenial-proposed Imported using git-ubuntu import. Changelog parent: 9afda2f6662f4f90341109d5a8207d6fc14f8707 New changelog entries: * Correct ephemeral warning to include the full command for removal (LP: #1554186). --- debian/changelog | 7 +++++++ debian/ephemeral-disk-warning.conf | 5 +++++ debian/ephemeral-disk-warning.sh | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/debian/changelog b/debian/changelog index ccf5886..bdbae20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +walinuxagent (2.1.3-0ubuntu4) xenial; urgency=medium + + * Correct ephemeral warning to include the full command for removal + (LP: #1554186). + + -- Ben Howard Mon, 07 Mar 2016 12:10:21 -0700 + walinuxagent (2.1.3-0ubuntu3) xenial; urgency=medium * Remove conflict with NetworkManager (LP: #1550461): diff --git a/debian/ephemeral-disk-warning.conf b/debian/ephemeral-disk-warning.conf index 39d54d1..7f60cfe 100644 --- a/debian/ephemeral-disk-warning.conf +++ b/debian/ephemeral-disk-warning.conf @@ -39,6 +39,11 @@ http://msdn.microsoft.com/en-us/library/windowsazure/jj672979.aspx To remove this warning run: sudo chattr -i $warn_file + sudo rm $warn_file + +This warning is written each boot; to disable it: + echo "manual" | sudo tee /etc/init/ephemeral-disk-warning.override + sudo systemctl disable ephemeral-disk-warning.service EOF chmod 0444 $warn_file diff --git a/debian/ephemeral-disk-warning.sh b/debian/ephemeral-disk-warning.sh index 3cc8f86..d497256 100755 --- a/debian/ephemeral-disk-warning.sh +++ b/debian/ephemeral-disk-warning.sh @@ -17,6 +17,11 @@ http://msdn.microsoft.com/en-us/library/windowsazure/jj672979.aspx To remove this warning run: sudo chattr -i $warn_file + sudo rm $warn_file + +This warning is written each boot; to disable it: + echo "manual" | sudo tee /etc/init/ephemeral-disk-warning.override + sudo systemctl disable ephemeral-disk-warning.service EOM -- cgit v1.2.3 From 4272f95a0eabc946d69d4eeb24c8485264301a7f Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 7 Mar 2016 12:10:21 -0700 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 3930ff1bb96ef2889d83b7887dbb71b2f950abad Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 7 Mar 2016 12:10:21 -0700 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 a025ca376a6c9a620cb4cfa6f1f6e070f1597163 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 7 Mar 2016 12:10:21 -0700 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 f2c691f64e4a49472fa7dc7f1aea67a3488a7fe2 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 7 Mar 2016 12:10:21 -0700 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