[lxc-devel] [lxc/lxc] 9f9e8e: Change find_fstype_cb to ignore blank lines and co...

[GitHub]

  Branch: refs/heads/stable-1.0
  Home:   https://github.com/lxc/lxc
  Commit: 9f9e8eb3f6b796cd4a31ab76c0ff2108dfdf3bb1
      https://github.com/lxc/lxc/commit/9f9e8eb3f6b796cd4a31ab76c0ff2108dfdf3bb1
  Author: Yuto KAWAMURA(kawamuray) <kawamuray.dadada at gmail.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  Change find_fstype_cb to ignore blank lines and comments

/etc/filesystems could be contain blank lines and comments.
Change find_fstype_cb() to ignore blank lines and comments which starts
with '#'.

Signed-off-by: Yuto KAWAMURA(kawamuray) <kawamuray.dadada at gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: 75867ef1e640ba1e8e9345bbc3edba8b52b67061
      https://github.com/lxc/lxc/commit/75867ef1e640ba1e8e9345bbc3edba8b52b67061
  Author: Yuto KAWAMURA(kawamuray) <kawamuray.dadada at gmail.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M src/lxc/lxc_stop.c

  Log Message:
  -----------
  Fix incorrect timeout handling of do_reboot_and_check()

Currently do_reboot_and_check() is decreasing timeout variable even if
it is set to -1, so running 'lxc-stop --reboot --timeout=-1 ...' will
exits immediately at end of second iteration of loop, without waiting
container reboot.
Also, there is no need to call gettimeofday if timeout is set to -1, so
these statements should be evaluated only when timeout is enabled.

Signed-off-by: Yuto KAWAMURA(kawamuray) <kawamuray.dadada at gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: 1cccce935e5bc64784c29f67211942fabfb5b093
      https://github.com/lxc/lxc/commit/1cccce935e5bc64784c29f67211942fabfb5b093
  Author: Dorian Eikenberg <Dorian.Eikenberg at uni-duesseldorf.de>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M src/python-lxc/lxc.c

  Log Message:
  -----------
  Fix attach_wait and threads

Signed-off-by: Dorian Eikenberg <dorian.eikenberg at uni-duesseldorf.de>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 06dfa8f91246438abc4f6a4fae9153bbb7159852
      https://github.com/lxc/lxc/commit/06dfa8f91246438abc4f6a4fae9153bbb7159852
  Author: Stéphane Graber <stgraber at ubuntu.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M src/lxc/lxc-device
    M src/lxc/lxc-ls.in

  Log Message:
  -----------
  Add support for --version to lxc-ls and lxc-device

This is based on the patch submitted by:
 Yuto KAWAMURA(kawamuray) <kawamuray.dadada at gmail.com>

Updated to use lxc.version rather than @LXC_VERSION@ and to apply to
both lxc-ls and lxc-device rather than just the former.

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>


Compare: https://github.com/lxc/lxc/compare/3ba37500231d...06dfa8f91246