The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/915

This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.

=== Description (from pull-request) ===
Fix the hardcoded path to the lxc-net config file in the lxc.spec.in

P.S.: First pull request via github, sorry if I make mistakes...
From bf3843213405d02d905a1392631a991828cd1743 Mon Sep 17 00:00:00 2001
From: Johannes Kastl <[email protected]>
Date: Thu, 24 Mar 2016 09:16:53 +0100
Subject: [PATCH] lxc.spec.in: fixed hardcoded path to lxc-net config file

---
 lxc.spec.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lxc.spec.in b/lxc.spec.in
index d0816d3..9cc8dc5 100644
--- a/lxc.spec.in
+++ b/lxc.spec.in
@@ -169,7 +169,7 @@ fi
 
 %post
 # This test should trigger a network configure on a new install.
-if [ ! -f %{_sysconfdir}/sysconfig/lxc-net ] || ! grep -q 'USE_LXC_BRIDGE=' 
%{_sysconfdir}/sysconfig/lxc-net
+if [ ! -f @LXC_DISTRO_SYSCONF@/lxc-net ] || ! grep -q 'USE_LXC_BRIDGE=' 
@LXC_DISTRO_SYSCONF@/lxc-net
 then
        # Grab a random 10net subnet.  Need to add test logic...
        while [ true ]
@@ -181,7 +181,7 @@ then
                fi
        done
 
-       cat >  %{_sysconfdir}/sysconfig/lxc-net <<EOF
+       cat >  @LXC_DISTRO_SYSCONF@/lxc-net <<EOF
 # Leave USE_LXC_BRIDGE as "true" if you want to use lxcbr0 for your
 # containers.  Set to "false" if you'll use virbr0 or another existing
 # bridge, or mavlan to your host's NIC.
_______________________________________________
lxc-devel mailing list
[email protected]
http://lists.linuxcontainers.org/listinfo/lxc-devel

Reply via email to