Travis CI | 1 Oct 20:29 2014

Passed: lxc/lxc#692 (lxc-1.1.0.alpha2 - e356822)

lxc / lxc (lxc-1.1.0.alpha2)
Build #692 passed.
2 minutes and 54 seconds
Stéphane Graber e356822 Changeset →
  change version to 1.1.0.alpha1 in configure.ac

Signed-off-by: Stéphane Graber <stgraber-GeWIH/nMZzLQT0dZR+AlfA@public.gmane.org>

Would you like to test your private code?

Travis Pro could be your new best friend!

_______________________________________________
lxc-devel mailing list
lxc-devel <at> lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
GitHub | 1 Oct 20:24 2014

[lxc/lxc] e35682: change version to 1.1.0.alpha1 in configure.ac

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: e356822da479b77c21b02119bcc96c915f8ddbee
      https://github.com/lxc/lxc/commit/e356822da479b77c21b02119bcc96c915f8ddbee
  Author: Stéphane Graber <stgraber@...>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M configure.ac

  Log Message:
  -----------
  change version to 1.1.0.alpha1 in configure.ac

Signed-off-by: Stéphane Graber <stgraber@...>

_______________________________________________
lxc-devel mailing list
lxc-devel <at> lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
GitHub | 1 Oct 20:24 2014

[lxc/lxc]

  Branch: refs/tags/lxc-1.1.0.alpha2
  Home:   https://github.com/lxc/lxc
_______________________________________________
lxc-devel mailing list
lxc-devel <at> lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
Tycho Andersen | 30 Sep 23:35 2014

[PATCH] lxc-checkpoint: close stdout/stdin when daemonizing

If we don't close these running lxc-checkpoint via:

ssh host "sudo lxc-checkpoint ..."

just hangs. We leave stderr open so that subesquent errors will print correctly
(and also because for whatever reason it doesn't break ssh :).

Signed-off-by: Tycho Andersen <tycho.andersen <at> canonical.com>
---
 src/lxc/lxc_checkpoint.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/lxc/lxc_checkpoint.c b/src/lxc/lxc_checkpoint.c
index 698e434..cfa08fc 100644
--- a/src/lxc/lxc_checkpoint.c
+++ b/src/lxc/lxc_checkpoint.c
 <at>  <at>  -154,6 +154,11  <at>  <at>  bool restore(struct lxc_container *c)
 		pid = fork();

 	if (pid == 0) {
+		if (my_args.daemonize) {
+			close(0);
+			close(1);
+		}
+
 		ret = c->restore(c, checkpoint_dir, verbose);

 		if (!ret) {
--

-- 
1.9.1

_______________________________________________
lxc-devel mailing list
lxc-devel <at> lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
Stéphane Graber | 30 Sep 21:56 2014

About to tag alpha-2

Hey everyone,

So just wanted to let you know that current git master is the alpha-2
candidate.

If you have some time today/tonight, please grab git master and test it
to find any major issue which we shouldn't release alpha-2 with.

If there's no report of such issue by tomorrow morning, I'll tag alpha-2
and then we'll resume landing changes into git master.

Thanks everyone who's contributed to LXC 1.1 so far and sorry for not
releasing an alpha earlier, I'd been postponing most of it due for the
systemd changes and those took longer to figure out than expected.

--

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com
_______________________________________________
lxc-devel mailing list
lxc-devel <at> lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
KATOH Yasufumi | 30 Sep 12:10 2014
Picon

[PATCH] lxc-config can show lxc.cgroup.(use|pattern)

Signed-off-by: KATOH Yasufumi <karma <at> jazz.email.ne.jp>
---
 src/lxc/lxc_config.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/lxc/lxc_config.c b/src/lxc/lxc_config.c
index 0658beb..d146ad8 100644
--- a/src/lxc/lxc_config.c
+++ b/src/lxc/lxc_config.c
 <at>  <at>  -36,6 +36,8  <at>  <at>  static struct lxc_config_items items[] =
 	{ .name = "lxc.bdev.lvm.vg", },
 	{ .name = "lxc.bdev.lvm.thin_pool", },
 	{ .name = "lxc.bdev.zfs.root", },
+	{ .name = "lxc.cgroup.use", },
+	{ .name = "lxc.cgroup.pattern", },
 	{ .name = NULL, },
 };

 <at>  <at>  -58,6 +60,7  <at>  <at>  static void list_config_items(void)
 int main(int argc, char *argv[])
 {
 	struct lxc_config_items *i;
+	const char *value;

 	if (argc < 2)
 		usage(argv[0]);
 <at>  <at>  -65,7 +68,11  <at>  <at>  int main(int argc, char *argv[])
 		list_config_items();
 	for (i = &items[0]; i->name; i++) {
 		if (strcmp(argv[1], i->name) == 0) {
-			printf("%s\n", lxc_get_global_config_item(i->name));
+			value = lxc_get_global_config_item(i->name);
+			if (value)
+				printf("%s\n", value);
+			else
+				printf("%s is not set.\n", argv[1]);
 			exit(0);
 		}
 	}
--

-- 
2.0.4

_______________________________________________
lxc-devel mailing list
lxc-devel <at> lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
GitHub | 30 Sep 00:57 2014

[lxc/lxc] 7981ea: pivot_root: umount ., not /

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 7981ea4684c878fe433d34743073c43bfadb870a
      https://github.com/lxc/lxc/commit/7981ea4684c878fe433d34743073c43bfadb870a
  Author: Serge Hallyn <serge.hallyn@...>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  pivot_root: umount ., not /

This fixes pivot_root on 3.11 and older kernels.

Signed-off-by: Serge Hallyn <serge.hallyn@...>
Acked-by: Stéphane Graber <stgraber@...>

_______________________________________________
lxc-devel mailing list
lxc-devel <at> lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
Serge Hallyn | 30 Sep 00:51 2014

[PATCH] pivot_root: umount ., not /

This fixes pivot_root on 3.11 and older kernels.

Signed-off-by: Serge Hallyn <serge.hallyn <at> ubuntu.com>
---
 src/lxc/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 31673d5..e8979c9 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
 <at>  <at>  -1062,7 +1062,7  <at>  <at>  static int setup_rootfs_pivot_root(const char *rootfs, const char *pivotdir)
 		SYSERROR("Error entering oldroot");
 		goto fail;
 	}
-	if (umount2("/", MNT_DETACH) < 0) {
+	if (umount2(".", MNT_DETACH) < 0) {
 		SYSERROR("Error detaching old root");
 		goto fail;
 	}
--

-- 
2.1.0

_______________________________________________
lxc-devel mailing list
lxc-devel <at> lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
GitHub | 30 Sep 00:45 2014

[lxc/lxc] 888cf0: sysconfig/lxc: Reverse sourcing logic

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 888cf064dd0f10ec834ce7c95d9269653cf8dd2c
      https://github.com/lxc/lxc/commit/888cf064dd0f10ec834ce7c95d9269653cf8dd2c
  Author: Stéphane Graber <stgraber@...>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M config/sysconfig/lxc.in

  Log Message:
  -----------
  sysconfig/lxc: Reverse sourcing logic

This prevents scripts running with -e to fail when lxc-net doesn't
exist.

Signed-off-by: Stéphane Graber <stgraber@...>

_______________________________________________
lxc-devel mailing list
lxc-devel <at> lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
GitHub | 29 Sep 18:42 2014

[lxc/lxc] 15bc51: add file/func/line to debug info

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 15bc516ea987be2fa3c085010d2e77a32820769c
      https://github.com/lxc/lxc/commit/15bc516ea987be2fa3c085010d2e77a32820769c
  Author: Serge Hallyn <serge.hallyn@...>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M src/lxc/log.c

  Log Message:
  -----------
  add file/func/line to debug info

Signed-off-by: Serge Hallyn <serge.hallyn@...>
Acked-by: Stéphane Graber <stgraber@...>

  Commit: 807f4c9e1eaae674c76fd3a97d0b4a8810004177
      https://github.com/lxc/lxc/commit/807f4c9e1eaae674c76fd3a97d0b4a8810004177
  Author: Jamie Strandboge <jamie@...>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M config/apparmor/abstractions/container-base
    M config/apparmor/abstractions/container-base.in

  Log Message:
  -----------
  apparmor: restrict signal and ptrace for processes

Restrict signal and ptrace for processes running under the container
profile. Rules based on AppArmor base abstraction. Add unix rules for
processes running under the container profile.

Signed-off-by: Jamie Strandboge <jamie@...>
Acked-by: Serge Hallyn <serge.hallyn@...>
Acked-by: Stéphane Graber <stgraber@...>

Compare: https://github.com/lxc/lxc/compare/fce070c81560...807f4c9e1eaa
_______________________________________________
lxc-devel mailing list
lxc-devel <at> lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
GitHub | 29 Sep 18:17 2014

[lxc/lxc] 0af993: Rework init scripts

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 0af993195cbd57cff700c7c90ee8f95c2a1ef8aa
      https://github.com/lxc/lxc/commit/0af993195cbd57cff700c7c90ee8f95c2a1ef8aa
  Author: Michael H. Warfield <mhw@...>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M config/Makefile.am
    M config/etc/Makefile.am
    A config/etc/default.conf.lxcbr
    R config/etc/default.conf.ubuntu
    M config/init/Makefile.am
    A config/init/common/Makefile.am
    A config/init/common/lxc-containers.in
    A config/init/common/lxc-net.in
    M config/init/systemd/Makefile.am
    M config/init/systemd/lxc-net.service.in
    M config/init/systemd/lxc.service.in
    M config/init/sysvinit/Makefile.am
    A config/init/sysvinit/lxc-containers.in
    A config/init/sysvinit/lxc-net.in
    R config/init/sysvinit/lxc.in
    M config/init/upstart/Makefile.am
    R config/init/upstart/lxc-net.conf
    A config/init/upstart/lxc-net.conf.in
    A config/sysconfig/Makefile.am
    A config/sysconfig/lxc.in
    M configure.ac
    M lxc.spec.in
    M src/lxc/Makefile.am
    R src/lxc/lxc.net

  Log Message:
  -----------
  Rework init scripts

This commit is based on the work of:
    Signed-off-by: Michael H. Warfield <mhw@...>

A generic changelog would be:
 - Bring support for lxcbr0 to all distributions
 - Share the container startup and network configuration logic across
   distributions and init systems.
 - Have all the init scripts call the helper script.
 - Support for the various different distro-specific configuration
   locations to configure lxc-net and container startup.

Changes on top of Mike's original version:
 - Remove sysconfig/lxc-net as it's apparently only there as a
   workaround for an RPM limitation and is breaking Debian systems by
   including a useless file which will get registered as a package provided
   conffile in the dpkg database and will therefore cause conffile prompts
   on upgrades...
 - Go with a consistant coding style in the various init scripts.
 - Split out the common logic from the sysvinit scripts and ship both in
   their respective location rather than have them be copies.
 - Fix the upstart jobs so they actually work (there's no such thing as
   libexec on Debian systems).

Signed-off-by: Stéphane Graber <stgraber@...>
Acked-by: Serge E. Hallyn <serge.hallyn@...>

  Commit: fce070c815604e863f4628ecceb172ffdbbb2465
      https://github.com/lxc/lxc/commit/fce070c815604e863f4628ecceb172ffdbbb2465
  Author: Dwight Engen <dwight.engen@...>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M .gitignore
    M config/init/common/lxc-containers.in
    M config/init/sysvinit/lxc-containers.in
    M config/init/sysvinit/lxc-net.in
    M lxc.spec.in
    M templates/lxc-oracle.in

  Log Message:
  -----------
  fixups to init script rework

- move action() from common to sysvinit wrapper since its only really
  applicable for sysvinit and not the other init systems

- fix bug in action() fallback, need to shift away msg before executing action

- make lxc-net 98 so it starts before lxc-container (99), otherwise the lxcbr0
  won't be available when containers are autostarted

- make the default RUNTIME_PATH be /var/run instead of /run. On older
  distros (like ol6.5) /run doesn't exist. lxc-net will create this directory
  and attempt to create the dnsmasq.pid file in it, but this will fail when
  SELinux is enabled because the directory will have the default_t type.
  Newer systems have /var/run symlinked to /run so you get to the same place
  in that case.

- add %postun to remove lxc-dnsmasq user when pkgs are removed

- fix bug in lxc-oracle template that was creating /var/lock/subsys/lxc as
  a dir and interfering with the init scripts

Signed-off-by: Dwight Engen <dwight.engen@...>
Acked-by: Stéphane Graber <stgraber@...>

Compare: https://github.com/lxc/lxc/compare/a1dd59de3564...fce070c81560
_______________________________________________
lxc-devel mailing list
lxc-devel <at> lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

Gmane