[packages/lxd] - fixed last commit

[mis]

commit eedd915a9050a99cdc28f179ded1566fa855f193
Author: mis <mis at pld-linux.org>
Date:   Wed Feb 22 09:47:26 2017 +0100

    - fixed last commit

 lxd.init      | 10 +---------
 lxd.spec      | 19 ++++++-------------
 lxd.sysconfig |  3 ---
 3 files changed, 7 insertions(+), 25 deletions(-)
---
diff --git a/lxd.spec b/lxd.spec
index 733b70a..5bace04 100644
--- a/lxd.spec
+++ b/lxd.spec
@@ -1,20 +1,18 @@
 # TODO
-# - lxdbr0 interface setup for systemd
 # - Consider use of lxd group for lxd
 
 Summary:	Fast, dense and secure container management
 Name:		lxd
-Version:	2.6.2
+Version:	2.9.2
 Release:	1	
 License:	Apache v2.0
 Group:		Applications/System
 Source0:	https://linuxcontainers.org/downloads/lxd/%{name}-%{version}.tar.gz
-# Source0-md5:	59a4f949c7cc6bb3846998e9d4e9adaa
+# Source0-md5:	f09c333ea237014ab3f6abf4f9173339
 Source1:	%{name}.service
 Source2:	%{name}.init
-Source3:	%{name}br.init
-Source4:	%{name}.sysconfig
-Source5:	%{name}.sh
+Source3:	%{name}.sysconfig
+Source4:	%{name}.sh
 URL:		http://linuxcontainers.org/
 %ifarch %{x8664} arm aarch64 ppc64
 BuildRequires:	criu-devel >= 1.7
@@ -88,16 +86,14 @@ install -p dist/bin/lxc $RPM_BUILD_ROOT%{_bindir}
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}br
-cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
-install -p %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/lxd-wrapper
+install -p %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/lxd-wrapper
 
 %pre
 %groupadd -g 273 %{name}
 
 %post
-/sbin/chkconfig --add %{name}br
 /sbin/chkconfig --add %{name}
 %service -n %{name} restart
 %systemd_post %{name}.service
@@ -105,9 +101,7 @@ install -p %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/lxd-wrapper
 %preun
 if [ "$1" = "0" ]; then
 	%service -q %{name} stop
-	%service -q %{name}br stop
 	/sbin/chkconfig --del %{name}
-	/sbin/chkconfig --del %{name}br
 fi
 %systemd_preun %{name}.service
 
@@ -125,7 +119,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.md CONTRIBUTING.md AUTHORS doc/*
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-%attr(754,root,root) /etc/rc.d/init.d/%{name}br
 %attr(755,root,root) %{_bindir}/lxc
 %attr(755,root,root) %{_sbindir}/lxd
 %{systemdunitdir}/%{name}.service
diff --git a/lxd.init b/lxd.init
index 2bf5fa4..1ed4147 100755
--- a/lxd.init
+++ b/lxd.init
@@ -36,14 +36,6 @@ start() {
 		RETVAL=1
 		return
 	fi
-
-	if [ -n "$BRIDGE_DEV" ]; then
-		if ! ip link show $BRIDGE_DEV up 2>/dev/null | grep -q $BRIDGE_DEV; then
-			nls "lxd bridge %s is down, start lxdbr service first" "$BRIDGE_DEV"
-			RETVAL=1
-			return
-		fi
-	fi
                 
 	msg_starting "lxd"
 	daemon --fork --waitforname lxd /usr/lib/lxd-wrapper daemon $OPTIONS 
@@ -55,7 +47,7 @@ start() {
 	ntry=0
 	while [ -z "$pid" -a $ntry -lt 5 ]; do
 		[ -z "$pid" ] && sleep 1
-		pid=$(lxc info 2>/dev/null | awk '/serverpid:/{print $2}')
+		pid=$(lxc info 2>/dev/null | awk '/server_pid:/{print $2}')
 		[ -n "$pid" ] && echo $pid > $pidfile
 		ntry=$(($ntry+1))
 	done
diff --git a/lxd.sysconfig b/lxd.sysconfig
index 666d6a7..fdae0d0 100644
--- a/lxd.sysconfig
+++ b/lxd.sysconfig
@@ -9,6 +9,3 @@ SERVICE_LIMITS="-n 1048576 -u 1048576"
 # Modify these options if you want to change the way the lxd daemon runs
 #OPTIONS=""
 
-# LXD bridge dev and ip address 
-BRIDGE_DEV="lxdbr0"
-#BRIDGE_IPADDR="192.168.1.1/24"
\ No newline at end of file
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lxd.git/commitdiff/eedd915a9050a99cdc28f179ded1566fa855f193