commit 82a3991b8c026819a338731652608e849d00c1a8
Author: spoksss <[email protected]>
Date: Sat Oct 18 22:58:11 2014 +0200
Fixed name of variable.
Added dependencies to build package.
lxc-pld.in.sh | 15 +++++++++------
lxc.spec | 6 ++++--
2 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/lxc.spec b/lxc.spec
index cd3ef99..4cdaee1 100644
--- a/lxc.spec
+++ b/lxc.spec
@@ -13,13 +13,13 @@ Summary: Linux Containers userspace tools
Summary(pl.UTF-8): Narzędzia do kontenerów linuksowych (LXC)
Name: lxc
Version: 1.0.5
-Release: 0.1
+Release: 0.2
License: LGPL v2.1+
Group: Applications/System
Source0:
https://www.linuxcontainers.org/downloads/%{name}-%{version}.tar.gz
# Source0-md5: 9d9af9e9e69a831cd50b58d91c786013
Source1: %{name}-pld.in.sh
-Source2: %{name}.init
+Source2: %{name}.init
Patch1: %{name}-pld.patch
URL: https://www.linuxcontainers.org/
BuildRequires: autoconf >= 2.50
@@ -31,9 +31,11 @@ BuildRequires: gnutls-devel
%{?with_apparmor:BuildRequires: libapparmor-devel}
BuildRequires: libcap-devel
%{?with_seccomp:BuildRequires: libseccomp-devel}
+BuildRequires: libxslt-progs
%{?with_lua:BuildRequires: lua51-devel >= 5.1}
BuildRequires: pkgconfig
%{?with_python:BuildRequires: python3-devel >= 3.2}
+BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.612
BuildRequires: sed >= 4.0
Requires: rc-scripts >= 0.4.6
diff --git a/lxc-pld.in.sh b/lxc-pld.in.sh
index 57132a5..d8d30ab 100755
--- a/lxc-pld.in.sh
+++ b/lxc-pld.in.sh
@@ -407,12 +407,15 @@ if [ "$(id -u)" != "0" ]; then
exit 1
fi
-if [ -z "$rootfs_path" ]; then
- rootfs_path=$path/rootfs
- # check for 'lxc.rootfs' passed in through default config by lxc-create
- if grep -q '^lxc.rootfs' $path/config 2>/dev/null ; then
- rootfs_path=$(awk -F= '/^lxc.rootfs =/{ print $2 }'
$path/config)
- fi
+if [ -z "$rootfs" ]; then
+ rootfs_path=$path/rootfs
+ # check for 'lxc.rootfs' passed in through default config by lxc-create
+ # TODO: should be lxc.rootfs.mount used instead?
+ if grep -q '^lxc.rootfs' $path/config 2>/dev/null ; then
+ rootfs_path=$(awk -F= '/^lxc.rootfs =/{ print $2 }' $path/config)
+ fi
+else
+ rootfs_path=$rootfs
fi
config_path=$default_path/$name
cache=$cache_base/$release
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lxc.git/commitdiff/c3f4492e14dd50c83c4aa271976f98768a73d2a4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
