clearlinux/WALinuxAgent
2
0
Fork 0
mirror of https://github.com/clearlinux/WALinuxAgent.git synced 2026-09-06 13:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove conflict of Network Manager for Redhat7

Browse Source
This commit is contained in:
Yue Zhang
2015-07-09 16:38:07 +08:00
parent 69a6ba6bb9
commit 04c60e1623
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpm/redhat6x.spec
-3
View File
@@ -19,10 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Vendor: Microsoft Corporation
Packager: Microsoft Corporation <walinuxagent@microsoft.com>
%if 0%{?rhel} < 7
Conflicts: NetworkManager
%endif
%description
The Azure Linux Agent supports the provisioning and running of Linux
rpm/redhat7x.spec
+2 -6
View File
@@ -20,14 +20,10 @@ BuildArch: noarch
Vendor: Microsoft Corporation
Packager: Microsoft Corporation <walinuxagent@microsoft.com>
%if 0%{?rhel} < 7
Conflicts: NetworkManager
%endif
%description
The Windows Azure Linux Agent supports the provisioning and running of Linux
VMs in the Windows Azure cloud. This package should be installed on Linux disk
images that are built to run in the Windows Azure environment.
VMs in the Microsoft Azure cloud. This package should be installed on Linux disk
images that are built to run in the Microsoft Azure environment.
%prep
%setup -q