[lxc-devel] [lxc/lxc] 0b9828: Bring static and const to tests too

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 0b98289ef95e83fcd493ba6688e57aa8b4fb53f7
      https://github.com/lxc/lxc/commit/0b98289ef95e83fcd493ba6688e57aa8b4fb53f7
  Author: Andrey Mazo <mazo at telum.ru>
  Date:   2014-01-02 (Thu, 02 Jan 2014)

  Changed paths:
    M src/tests/attach.c
    M src/tests/concurrent.c
    M src/tests/list.c
    M src/tests/locktests.c
    M src/tests/may_control.c
    M src/tests/reboot.c
    M src/tests/snapshot.c

  Log Message:
  -----------
  Bring static and const to tests too

Signed-off-by: Andrey Mazo <mazo at telum.ru>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>


  Commit: 99c2fb07d74c20d0eec38c05c4ac64e5782d8e7d
      https://github.com/lxc/lxc/commit/99c2fb07d74c20d0eec38c05c4ac64e5782d8e7d
  Author: Michael H. Warfield <mhw at WittsEnd.com>
  Date:   2014-01-02 (Thu, 02 Jan 2014)

  Changed paths:
    M templates/lxc-centos.in
    M templates/lxc-fedora.in

  Log Message:
  -----------
  Additional logic for dealing with container shutdown / reboot

Additional logic for dealing with container shutdown / reboot

Fix a problem with CentOS containers and legacy Fedora (<16) containers
not shutting down or rebooting properly.  Copy /etc/init.d/halt to
/etc/init.d/lxc-halt, deleting everything from the "hwclock save" and
all after and append a force halt or reboot at the end of the new
script, to prevent reexecing init.  Link that script in as
S00lxc-halt in rc0.d and S00lxc-reboot in rc6.d to intercept the
shutdown process before it gets to S01halt / S01reboot causing the hang.

Fixed some typos in the CentOS template that were introduced in the
previous patch for hwaddr settings and missed in regression testing.

Cleaned up some instruction typos and tabs from previous patch.

Signed-off-by: Michael H. Warfield <mhw at WittsEnd.com>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>


  Commit: a771fe18d28890cfc545995fb818aa7472744fde
      https://github.com/lxc/lxc/commit/a771fe18d28890cfc545995fb818aa7472744fde
  Author: Dwight Engen <dwight.engen at oracle.com>
  Date:   2014-01-02 (Thu, 02 Jan 2014)

  Changed paths:
    M doc/lxc-autostart.sgml.in
    M src/lxc/lxc_autostart.c

  Log Message:
  -----------
  change lxc-autostart shutdown to behave like lxc-stop

It is desirable to have a mode where a soft shutdown is requested,
but then do a hard shutdown if after some time period the container
has not shut down. This the default behaviour of lxc-stop, but is
not currently possible with lxc-autostart. This change makes this
the default behaviour when shutdown is specified to lxc-autostart.
This will be very useful for init scripts.

An indefinte wait for soft shutdown (though I'm not sure how that
would be useful) is still possible by passing a timeout of 0.

Change default timeout value to 60 seconds to match lxc-stop

Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>


  Commit: 0a83cbbb7592ccb4901a790e7677884d728df6f7
      https://github.com/lxc/lxc/commit/0a83cbbb7592ccb4901a790e7677884d728df6f7
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2014-01-02 (Thu, 02 Jan 2014)

  Changed paths:
    M src/lxc/bdev.c
    M src/lxc/bdev.h
    M src/lxc/lxccontainer.c
    M src/lxc/lxccontainer.h

  Log Message:
  -----------
  snapshot: enforce keeping same backing store type (v2)

Stéphane noticed that lxc-snapshot of a dir-backed container
created an overlayfs container.  The expectation is that the
user can continue to modify the original container and later make
a new snapshot, but this doesn't work with the existing behavior -
the overlayfs clone will end up with the modified contents.

So add a 'LXC_CLONE_KEEPBDEVTYPE' flag, which c->snapshot()
passes to c->clone().

Also add a LXC_CLONE_MAYBE_SNAPSHOT.  If this is set and a
backing store does not support snapshotting, then proceed with
a copy clone.

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>


Compare: https://github.com/lxc/lxc/compare/74a3920a972e...0a83cbbb7592