[lxc-devel] [PATCH] [v3] Integrated lxc-net service for rpm based platforms.

[Michael H. Warfield]

On Mon, 2014-08-25 at 17:08 -0400, Michael H. Warfield wrote:
> On Mon, 2014-08-25 at 16:28 -0400, Stéphane Graber wrote:
> > Just started reviewing this, it looks like you're at least missing
> > default.conf.lxcbr in your patch.

> Crap.  I did a "commit -a".  Should have been a rename.

> Grrr...  Checking it out.  Thanks!

No idea how it happened but it did.  In fact, it missed 4 files.  Only
thing I can figure is that I must have dropped the ball along the way of
regression testing and rolling up the changes in the 3 versions.  :-P

Regards,
Mike
-- 
Subject: [PATCH] Catching up missing files from previous integration patch.

Files added from previous patch (renamed or new).

Signed-off-by: Michael H. Warfield <mhw at WittsEnd.com>
---
 config/etc/default.conf.lxcbr |  4 ++++
 config/sysconfig/Makefile.am  |  7 +++++++
 config/sysconfig/lxc-net      |  4 ++++
 config/sysconfig/lxc.in       | 29 +++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 config/etc/default.conf.lxcbr
 create mode 100644 config/sysconfig/Makefile.am
 create mode 100644 config/sysconfig/lxc-net
 create mode 100644 config/sysconfig/lxc.in

diff --git a/config/etc/default.conf.lxcbr b/config/etc/default.conf.lxcbr
new file mode 100644
index 0000000..661718b
--- /dev/null
+++ b/config/etc/default.conf.lxcbr
@@ -0,0 +1,4 @@
+lxc.network.type = veth
+lxc.network.link = lxcbr0
+lxc.network.flags = up
+lxc.network.hwaddr = 00:16:3e:xx:xx:xx
diff --git a/config/sysconfig/Makefile.am b/config/sysconfig/Makefile.am
new file mode 100644
index 0000000..d4b7ec3
--- /dev/null
+++ b/config/sysconfig/Makefile.am
@@ -0,0 +1,7 @@
+sysconfigdir="@LXC_DISTRO_SYSCONF@"
+
+sysconfig_DATA = \
+	lxc \
+	lxc-net
+
+EXTRA_DIST = $(sysconfig_DATA)
diff --git a/config/sysconfig/lxc-net b/config/sysconfig/lxc-net
new file mode 100644
index 0000000..4e7677c
--- /dev/null
+++ b/config/sysconfig/lxc-net
@@ -0,0 +1,4 @@
+# This file will be regenerated by postinst if it does not exist
+# or if USE_LXC_BRIDGE is not present.  This is a placeholder file
+# so rpm knows about it as a configuration file in its database.
+
diff --git a/config/sysconfig/lxc.in b/config/sysconfig/lxc.in
new file mode 100644
index 0000000..c5b9aca
--- /dev/null
+++ b/config/sysconfig/lxc.in
@@ -0,0 +1,29 @@
+# LXC_AUTO - whether or not to start containers at boot
+LXC_AUTO="true"
+
+# BOOTGROUPS - What groups should start on bootup?
+#	Comma separated list of groups.
+#	Leading comma, trailing comma or embedded double
+#	comma indicates when the NULL group should be run.
+# Example (default): boot the onboot group first then the NULL group
+BOOTGROUPS="onboot,"
+
+# SHUTDOWNDELAY - Wait time for a container to shut down.
+#	Container shutdown can result in lengthy system
+#	shutdown times.  Even 5 seconds per container can be
+#	too long.
+SHUTDOWNDELAY=5
+
+# OPTIONS can be used for anything else.
+#	If you want to boot everything then
+#	options can be "-a" or "-a -A".
+OPTIONS=
+
+# STOPOPTS are stop options.  The can be used for anything else to stop.
+#	If you want to kill containers fast, use -k
+STOPOPTS="-a -A -s"
+
+USE_LXC_BRIDGE="false"  # overridden in lxc-net
+
+[ -f @LXC_DISTRO_SYSCONF@/lxc-net ] && . @LXC_DISTRO_SYSCONF@/lxc-net
+
-- 
1.9.3



-- 
Michael H. Warfield (AI4NB) | (770) 978-7061 |  mhw at WittsEnd.com
   /\/\|=mhw=|\/\/          | (678) 463-0932 |  http://www.wittsend.com/mhw/
   NIC whois: MHW9          | An optimist believes we live in the best of all
 PGP Key: 0x674627FF        | possible worlds.  A pessimist is sure of it!

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 465 bytes
Desc: This is a digitally signed message part
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20140825/b94ac849/attachment.sig>