u/fuel: Bump & rebase for new deploy arg `-E`
[armband.git] / patches / opnfv-fuel / 0006-libvirt-Use-libvirt-unix_sock_group.patch
1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
2 : Copyright (c) 2017 Enea AB and others.
3 :
4 : All rights reserved. This program and the accompanying materials
5 : are made available under the terms of the Apache License, Version 2.0
6 : which accompanies this distribution, and is available at
7 : http://www.apache.org/licenses/LICENSE-2.0
8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
9 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
10 Date: Sun, 20 Aug 2017 18:18:53 +0200
11 Subject: [PATCH] libvirt: Use "libvirt" unix_sock_group
12
13 On AArch64, libvirt 3.x is used, which uses "libvirt" by default,
14 so change old "libvirtd" in <libvirt/files/libvirtd.conf.Debian>.
15
16 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
17 ---
18  ...libvirt-unix_sock_group-s-libvirtd-libvirt.patch | 21 +++++++++++++++++++++
19  mcp/patches/patches.list                            |  1 +
20  2 files changed, 22 insertions(+)
21  create mode 100644 mcp/patches/0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
22
23 diff --git a/mcp/patches/0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch b/mcp/patches/0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
24 new file mode 100644
25 index 0000000..003b249
26 --- /dev/null
27 +++ b/mcp/patches/0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
28 @@ -0,0 +1,21 @@
29 +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
30 +Date: Sun, 20 Aug 2017 02:03:01 +0200
31 +Subject: [PATCH] libvirt: unix_sock_group: s/libvirtd/libvirt/
32 +
33 +On AArch64, libvirt 3.x is used, which uses "libvirt" by default.
34 +
35 +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
36 +---
37 +
38 +diff --git a/libvirt/files/libvirtd.conf.Debian b/libvirt/files/libvirtd.conf.Debian
39 +--- a/libvirt/files/libvirtd.conf.Debian
40 ++++ b/libvirt/files/libvirtd.conf.Debian
41 +@@ -81,7 +81,7 @@
42 + # without becoming root.
43 + #
44 + # This is restricted to 'root' by default.
45 +-unix_sock_group = "libvirtd"
46 ++unix_sock_group = "libvirt"
47 +
48 + # Set the UNIX socket permissions for the R/O socket. This is used
49 + # for monitoring VM status only
50 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
51 index 4f6cc56..688a9af 100644
52 --- a/mcp/patches/patches.list
53 +++ b/mcp/patches/patches.list
54 @@ -19,3 +19,4 @@
55  /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
56  /usr/share/salt-formulas/env: 0013-maas-region-Allow-subnets-without-fabrics.patch
57  /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
58 +/usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch