summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaikel Wever2016-08-23 12:59:56 +0200
committerMaikel Wever2016-08-23 12:59:56 +0200
commit92e88b5a7d21291ed36e32c11dbaebc1dd550c02 (patch)
tree27ad8649f2c9beee0b510f1ca178e3975b7397a7
parent144916131688c69781c2ba225d821a8006c4e09c (diff)
downloadaur-92e88b5a7d21291ed36e32c11dbaebc1dd550c02.tar.gz
Update to 2.1 and fix dnsmasq dbus error
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD9
-rw-r--r--dnsmasq@lxd.service2
3 files changed, 13 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a107a4d8ec25..2c90e27117fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Fri Jul 1 08:42:11 UTC 2016
+# Tue Aug 23 10:59:38 UTC 2016
pkgbase = lxd
pkgdesc = REST API, command line tool and OpenStack integration plugin for LXC.
- pkgver = 2.0.3
- pkgrel = 2
+ pkgver = 2.1
+ pkgrel = 1
url = https://github.com/lxc/lxd
arch = x86_64
license = APACHE
@@ -15,19 +15,20 @@ pkgbase = lxd
optdepends = btrfs-progs: for btrfs support
optdepends = linux-userns: kernel with CONFIG_USER_NS enabled
optdepends = linux-lts-userns: LTS kernel with CONFIG_USER_NS enabled
+ conflicts = lxd-lts
options = !strip
options = !emptydirs
- source = https://github.com/lxc/lxd/archive/lxd-2.0.3.tar.gz
+ source = https://github.com/lxc/lxd/archive/lxd-2.1.tar.gz
source = lxd.service
source = dnsmasq-lxd.conf
source = dnsmasq@lxd.service
source = lxd.netctl
source = dbus-dnsmasq-lxd.conf
source = networkmanager-dnsmasq-lxd.conf
- md5sums = 69a125da7d2107b3ef944347dad6c02a
+ md5sums = b088e520e9fddd5fda1a1ab8f498c348
md5sums = b1780c0e01e404895e35ac277aa597c4
md5sums = b1fd16933c1b24aaa9ccc8f5a0e6478c
- md5sums = e164eaad33795310c024b21764679afb
+ md5sums = f2bc527eabb1fdba810b0393ee41edd4
md5sums = 52c641ea0ba5477f5c1a1b857c03dda9
md5sums = c9b5c98497e4ddc47d0c078b5b500f93
md5sums = 427926fddb1537f7a65d0a7274106df5
diff --git a/PKGBUILD b/PKGBUILD
index 9e012d9ad6ea..30f90a3adaf1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,13 @@
# Maintainer: Maikel Wever <maikelwever@gmail.com>
pkgname=lxd
-pkgver=2.0.3
-pkgrel=2
+pkgver=2.1
+pkgrel=1
pkgdesc="REST API, command line tool and OpenStack integration plugin for LXC."
arch=('x86_64')
url="https://github.com/lxc/lxd"
license=('APACHE')
+conflicts=('lxd-lts')
depends=('lxc')
makedepends=('go' 'git')
options=('!strip' '!emptydirs')
@@ -28,10 +29,10 @@ source=(
"networkmanager-dnsmasq-lxd.conf"
)
-md5sums=('69a125da7d2107b3ef944347dad6c02a'
+md5sums=('b088e520e9fddd5fda1a1ab8f498c348'
'b1780c0e01e404895e35ac277aa597c4'
'b1fd16933c1b24aaa9ccc8f5a0e6478c'
- 'e164eaad33795310c024b21764679afb'
+ 'f2bc527eabb1fdba810b0393ee41edd4'
'52c641ea0ba5477f5c1a1b857c03dda9'
'c9b5c98497e4ddc47d0c078b5b500f93'
'427926fddb1537f7a65d0a7274106df5')
diff --git a/dnsmasq@lxd.service b/dnsmasq@lxd.service
index d56a9b784b39..a523cfec5118 100644
--- a/dnsmasq@lxd.service
+++ b/dnsmasq@lxd.service
@@ -9,7 +9,7 @@ Documentation=man:dnsmasq(8)
Type=dbus
BusName=uk.org.thekelleys.dnsmasq-lxd
ExecStartPre=/usr/bin/dnsmasq --test -C /etc/dnsmasq-lxd.conf
-ExecStart=/usr/bin/dnsmasq -k -C /etc/dnsmasq-lxd.conf --user=dnsmasq --pid-file --enable-dbus=uk.org.thekelleys.dnsmasq-lxd
+ExecStart=/usr/bin/dnsmasq -k -C /etc/dnsmasq-lxd.conf --user=dnsmasq --pid-file
ExecReload=/bin/kill -HUP $MAINPID
[Install]