commit WALinuxAgent for openSUSE:Factory
Hello community, here is the log from the commit of package WALinuxAgent for openSUSE:Factory checked in at 2014-11-26 10:33:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/WALinuxAgent (Old) and /work/SRC/openSUSE:Factory/.WALinuxAgent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "WALinuxAgent" Changes: -------- --- /work/SRC/openSUSE:Factory/WALinuxAgent/WALinuxAgent.changes 2014-10-08 22:13:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.WALinuxAgent.new/WALinuxAgent.changes 2014-11-26 10:34:04.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Nov 24 22:17:28 UTC 2014 - bear454@opensuse.org + +- Apply patch to use wicked in openSUSE 13.2 + from PR#57 ( https://github.com/Azure/WALinuxAgent/pull/57 ) + + waagent-use-wicked-for-13_2.patch + +------------------------------------------------------------------- +Mon Nov 24 22:05:41 UTC 2014 - bear454@opensuse.org + +- Update to version 2.0.9 + + Change project url + +------------------------------------------------------------------- Old: ---- WALinuxAgent-2.0.8.tar.bz2 New: ---- WALinuxAgent-2.0.9.tar.gz waagent-use-wicked-for-13_2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ WALinuxAgent.spec ++++++ --- /var/tmp/diff_new_pack.qboItV/_old 2014-11-26 10:34:05.000000000 +0100 +++ /var/tmp/diff_new_pack.qboItV/_new 2014-11-26 10:34:05.000000000 +0100 @@ -20,12 +20,13 @@ Summary: The Windows Azure Linux Agent License: Apache-2.0 Group: System/Daemons -Version: 2.0.8 +Version: 2.0.9 Release: 0 -Url: https://github.com/WindowsAzure/WALinuxAgent -Source0: WALinuxAgent-%{version}.tar.bz2 +Url: https://github.com/Azure/WALinuxAgent +Source0: https://github.com/Azure/%{name}/archive/%{name}-%{version}.tar.gz Source1: 99-azure-timeout.rules Source2: README.SUSE +Patch0: waagent-use-wicked-for-13_2.patch BuildRequires: python-devel BuildRequires: python-setuptools @@ -70,7 +71,8 @@ images that are built to run in the Windows Azure environment. %prep -%setup -q +%setup -qn %{name}-%{name}-%{version} +%patch0 -p1 find . -type f -exec sed -i 's/\r//' {} + find . -type f -exec chmod 0644 {} + ++++++ waagent-use-wicked-for-13_2.patch ++++++
From d6a16631e61ad7e8aa65d0d8aeddc4c0b1100fb3 Mon Sep 17 00:00:00 2001 From: "Stephen A. Zarkos" <stephen.zarkos@microsoft.com> Date: Mon, 17 Nov 2014 15:06:04 -0800 Subject: [PATCH] Fixup dhcp_client_name for openSUSE 13.2+
--- waagent | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/waagent b/waagent index a4b9ee2..de2358b 100644 --- a/waagent +++ b/waagent @@ -790,7 +790,8 @@ class SuSEDistro(AbstractDistro): self.requiredDeps += [ "/sbin/insserv" ] self.init_file=suse_init_file self.dhcp_client_name='dhcpcd' - if (DistInfo(fullname=1)[0] == 'SUSE Linux Enterprise Server') and (DistInfo()[1] >= '12'): + if ((DistInfo(fullname=1)[0] == 'SUSE Linux Enterprise Server' and DistInfo()[1] >= 12) or \ + (DistInfo(fullname=1)[0] == 'openSUSE' and DistInfo()[1] >= 13.2)): self.dhcp_client_name='wickedd-dhcp4' self.grubKernelBootOptionsFile = '/boot/grub/menu.lst' self.grubKernelBootOptionsLine = 'kernel' -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de