- run lxd via lxd-wrapper script as --redirfds does not help here (because of golang...

diff --git a/lxd.init b/lxd.init
index 9a13ce54f814a742a18be38c674b2ea254cc5edd..b24b72d769d2c0f0862dcad25837434540b7bd84 100755 (executable)
--- a/lxd.init
+++ b/lxd.init
@@ -46,7 +46,7 @@ start() {
        fi
                 
        msg_starting "lxd"
-       daemon --fork --waitforname lxd /usr/sbin/lxd daemon $OPTIONS 
+       daemon --fork --waitforname lxd /usr/lib/lxd-wrapper daemon $OPTIONS 
        
        # lxd does not write pidfile, so create one
        show "Checking lxd daemon status"

diff --git a/lxd.spec b/lxd.spec
index 89b53ee32acd1ea5749ed83ac0279d90419c32f2..fd519179bb9970012e187ced41168bfb94b436cc 100644 (file)
--- a/lxd.spec
+++ b/lxd.spec
@@ -1,7 +1,10 @@
+# TODO
+# - lxdbr0 interface setup for systemd
+
 Summary:       Fast, dense and secure container management
 Name:          lxd
 Version:       2.1
-Release:       0.2
+Release:       0.3
 License:       Apache v2.0
 Group:         Applications/System
 Source0:       https://linuxcontainers.org/downloads/lxd/%{name}-%{version}.tar.gz
@@ -10,6 +13,7 @@ Source1:      %{name}.service
 Source2:       %{name}.init
 Source3:       %{name}br.init
 Source4:       %{name}.sysconfig
+Source5:       %{name}.sh
 URL:           http://linuxcontainers.org/
 %ifarch %{x8664} arm aarch64 ppc64
 BuildRequires: criu-devel >= 1.7
@@ -35,6 +39,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**};
 %define                gopath          %{_libdir}/golang
 %define                import_path     github.com/lxc/lxd
+%define                _libexecdir     %{_prefix}/lib
 
 %description
 LXD is a container "hypervisor" and a new user experience for LXC.
@@ -75,7 +80,6 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man1,/etc/{rc.d/ini
 # lxd refuses to start containter without this directory
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/rootfs
 
-
 install -p dist/bin/lxd $RPM_BUILD_ROOT%{_sbindir}
 install -p dist/bin/lxc $RPM_BUILD_ROOT%{_bindir}
 
@@ -84,6 +88,8 @@ 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}
 
+install -p %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/lxd-wrapper
+
 %pre
 %groupadd -g 273 %{name}
 
@@ -121,6 +127,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/lxd
 %{systemdunitdir}/%{name}.service
 %dir %attr(750,root,root) %{_libdir}/%{name}
+%dir %attr(750,root,root) %{_libdir}/%{name}/rootfs
+%attr(750,root,root) %{_libexecdir}/%{name}-wrapper
 %dir %attr(750,root,logs) /var/log/%{name}
 %dir %attr(700,root,root) /var/lib/%{name}
 %dir %attr(700,root,root) /var/lib/%{name}/containers