Commit cce8b5cf by Stéphane Graber

Merge pull request #916 from ojkastl/20160324_Fix_path_to_lxc-net_config

lxc.spec.in: fixed hardcoded path to lxc-net config file
parents 28711463 cd27b6c8
...@@ -169,7 +169,7 @@ fi ...@@ -169,7 +169,7 @@ fi
%post %post
# This test should trigger a network configure on a new install. # 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 then
# Grab a random 10net subnet. Need to add test logic... # Grab a random 10net subnet. Need to add test logic...
while [ true ] while [ true ]
...@@ -181,7 +181,7 @@ then ...@@ -181,7 +181,7 @@ then
fi fi
done 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 # 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 # containers. Set to "false" if you'll use virbr0 or another existing
# bridge, or mavlan to your host's NIC. # bridge, or mavlan to your host's NIC.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment