[lxc-devel] [lxc/lxc] b7bf79: lxc-user-nic: remove delta between master + stable

GitHub noreply at github.com
Sun Sep 10 17:59:56 UTC 2017


  Branch: refs/heads/stable-2.0
  Home:   https://github.com/lxc/lxc
  Commit: b7bf792663a1b2926a65854ceddfc5b8d5360049
      https://github.com/lxc/lxc/commit/b7bf792663a1b2926a65854ceddfc5b8d5360049
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  lxc-user-nic: remove delta between master + stable

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 8ddde7baff47f05e0c58237bc47a3e7a3f7da8f4
      https://github.com/lxc/lxc/commit/8ddde7baff47f05e0c58237bc47a3e7a3f7da8f4
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/lxc_user_nic.c
    M src/lxc/network.c
    M src/lxc/network.h
    M src/lxc/start.c

  Log Message:
  -----------
  lxc-user-nic: test privilege over netns on delete

When lxc-user-nic is called with the "delete" subcommand we need to make sure
that we are actually privileged over the network namespace for which we are
supposed to delete devices on the host. To this end we require that path to the
affected network namespace is passed. We then setns() to the network namespace
and drop privilege to the caller's real user id. Then we try to delete the
loopback interface which is not possible. If we are privileged over the network
namespace this operation will fail with ENOTSUP. If we are not privileged over
the network namespace we will get EPERM.

This is the first part of the commit. As of now nothing guarantees that the
caller does not just give us a random path to a network namespace it is
privileged over.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: dd208f1a336f824399419bdceafad14c072d710f
      https://github.com/lxc/lxc/commit/dd208f1a336f824399419bdceafad14c072d710f
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/confile_utils.c

  Log Message:
  -----------
  network: log veth_attr.pair and veth_attr.veth1

If the user specified lxc.net.[i].veth.pair attribute to request that the host
side of a veth pair be given a specific name let's log it at the trace level.
Otherwise, if the user didn't not specify lxc.net.[i].veth.pair veth_attr.veth1
will contain the name of the host side veth device.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 1482e8e0f6cd18a9cd2b6bd2031e4f2695d2a682
      https://github.com/lxc/lxc/commit/1482e8e0f6cd18a9cd2b6bd2031e4f2695d2a682
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/network.h

  Log Message:
  -----------
  network: add ifindex field for host veth device

We should not just record the ifindex for the container's veth device but also
for the host's veth device. This is useful when {configuring,deconfiguring}
veth devices and becomes crucial when calling our lxc-user-nic setuid helper
where we rely on the ifindex to make decisions about whether we are licensed to
perform certain operations on the veth device in question.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 9a5df38f322c7fb6d00ee3fd59c7aaaaf1c6c54b
      https://github.com/lxc/lxc/commit/9a5df38f322c7fb6d00ee3fd59c7aaaaf1c6c54b
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/network.h

  Log Message:
  -----------
  network: document all fields in struct lxc_netdev

This is menial work but I'll thank myself later... a lot.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 434f6022d5d0803e4160d1101a4cf299e3cbfc69
      https://github.com/lxc/lxc/commit/434f6022d5d0803e4160d1101a4cf299e3cbfc69
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/confile_utils.c

  Log Message:
  -----------
  network: log ifindex for host side veth device

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 96416905e79d09e3cd572c1b3ccbb8323d43cffa
      https://github.com/lxc/lxc/commit/96416905e79d09e3cd572c1b3ccbb8323d43cffa
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/lxc_user_nic.c
    M src/lxc/network.c
    M src/lxc/network.h
    M src/lxc/start.c

  Log Message:
  -----------
  network: rework network creation

- On unprivileged veth network creation have lxc-user-nic send the names of the
  veth devices and their respective ifindeces. The advantage of retrieving this
  information from lxc-user-nic is that we spare us sending around more stuff
  via the netpipe in start.c. Also, lxc-user-nic operates in both namespaces
  (the container's namespace and the hosts's namespace) via setns and so is
  guaranteed to retrieve the correct ifindex via if_nametoindex() which is an
  network namespace aware ioctl() call. While I'm pretty sure the ifindeces for
  veth devices are identical across network namespaces I'm weary to rely on
  this. We need the ifindexes to guarantee safe deletion of unprivileged
  network devices via lxc-user-nic later on since we use them to identify the
  network devices in their corresponding network namespaces.
- Move the network device logging from the child to the parent. The child does
  not have all of the information about the network devices available only the
  few bits it actually needs to now. The monitor process is the only process
  that needs all this information.
- The network creation code for privileged and unprivileged networks was
  previously mangled into one single function but at the same time some of the
  privileged code had additional functions that were called in other places in
  start.c. Let's divide and conquer and split out the privileged and
  unprivileged network creation into completely separate functions. This makes
  what's happening way more clear. This will also have no performance impact
  since either you are privileged and only execute the privileged network
  creation functions or you are unprivileged and only execute the unprivileged
  network creation functions.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 59574a77e34c5646cc0fe74f4996a3e11a3d1f94
      https://github.com/lxc/lxc/commit/59574a77e34c5646cc0fe74f4996a3e11a3d1f94
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/network.c

  Log Message:
  -----------
  network: retrieve the host's veth device ifindex

- Retrieve the host's veth device ifindex in the host's network namespace.
- Add a note why we retrieve the container's veth device ifindex in the host's
  network namespace.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: e1bbc5cef109cfb264d23618b7d24dfc35512b38
      https://github.com/lxc/lxc/commit/e1bbc5cef109cfb264d23618b7d24dfc35512b38
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/start.c

  Log Message:
  -----------
  start: non-functional changes

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: e1008bcdc96c67d23b67323b33867c6c04954406
      https://github.com/lxc/lxc/commit/e1008bcdc96c67d23b67323b33867c6c04954406
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  lxc-user-nic: free memory and check for error

- check for error on ifindex retrieval
- free allocated memory

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 9d9677174c8a945c033d1426593adee42ba96e7f
      https://github.com/lxc/lxc/commit/9d9677174c8a945c033d1426593adee42ba96e7f
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  lxc-user-nic: initialize vars to silence gcc-7

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: c740c4d44cae8e362c647eb2c2d1f1390d527c97
      https://github.com/lxc/lxc/commit/c740c4d44cae8e362c647eb2c2d1f1390d527c97
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/confile.c
    M src/lxc/confile_utils.c
    M src/lxc/confile_utils.h
    M src/lxc/criu.c
    M src/lxc/network.c
    M src/lxc/network.h
    M src/lxc/start.c

  Log Message:
  -----------
  network: use static memory for net device names

All network devices can only be of size < IFNAMSIZ. So let's spare the useless
heap allocations and use static memory.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: a840c5a4f8f12405cfe6a868ee8257db8fb6a461
      https://github.com/lxc/lxc/commit/a840c5a4f8f12405cfe6a868ee8257db8fb6a461
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/network.c
    M src/lxc/network.h

  Log Message:
  -----------
  network: non-functional changes

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: dce32a4a7403775c62a5dbbd4ce733c4b5a565c9
      https://github.com/lxc/lxc/commit/dce32a4a7403775c62a5dbbd4ce733c4b5a565c9
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/start.c
    M src/lxc/start.h

  Log Message:
  -----------
  start: non-functional changes

This renames the socketpair() variable "ttysock" to "data_sock" since we will
use it to send arbitrary data around, not just ttys anymore.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 3c8aec6383be2c28d0f883351bdf522139226c9e
      https://github.com/lxc/lxc/commit/3c8aec6383be2c28d0f883351bdf522139226c9e
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/network.c
    M src/lxc/network.h
    M src/lxc/start.c
    M src/lxc/start.h

  Log Message:
  -----------
  network: retrieve correct names and ifindices

On privileged network creation we only retrieved the names and ifindeces of
network devices in the host's network namespace. This meant that the monitor
process was acting on possibly incorrect information. With this commit we have
the child send back the correct device names and ifindeces in the container's
network namespace.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: d3c66b20cae5bcd13e0afcbabdb4b9385e8699ff
      https://github.com/lxc/lxc/commit/d3c66b20cae5bcd13e0afcbabdb4b9385e8699ff
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/conf.h
    M src/lxc/confile_utils.c
    M src/lxc/network.c
    M src/lxc/network.h
    M src/lxc/start.c

  Log Message:
  -----------
  network: stop recording saved physical net devices

liblxc will now correctly log any network device names and ifindeces in their
respective network namespaces. So there's no need to record physical network
devices any more. This spares us heap allocations and memory we need to have
lying around til the container is shutdown.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 604c11cfcc7417eb72a9da42b63c1f18439c65e9
      https://github.com/lxc/lxc/commit/604c11cfcc7417eb72a9da42b63c1f18439c65e9
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/network.c

  Log Message:
  -----------
  network: use correct network device name

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: a02ea680da28f8fe6c4f3bf93e461d7a8dcbffe6
      https://github.com/lxc/lxc/commit/a02ea680da28f8fe6c4f3bf93e461d7a8dcbffe6
  Author: Dimitri John Ledkov <xnox at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M templates/lxc-ubuntu.in

  Log Message:
  -----------
  templates/ubuntu: support netplan in newer releases by default

If netplan is present in the container, configure default networking
with neplan instead of ifupdown. Also, do not install ifupdown when
boostrapping minbase variant, unless using currently support
non-netplan releases (trusty, zenial, zesty).

Signed-off-by: Dimitri John Ledkov <xnox at ubuntu.com>
Acked-by: Christian Brauner <christian.brauner at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 0f4fc8edd3e4e4bd3a4d15ea9e93bc5750522031
      https://github.com/lxc/lxc/commit/0f4fc8edd3e4e4bd3a4d15ea9e93bc5750522031
  Author: Dimitri John Ledkov <xnox at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M templates/lxc-ubuntu.in

  Log Message:
  -----------
  Check that there is netplan binary, rather than just just a config directory.

Signed-off-by: Dimitri John Ledkov <xnox at ubuntu.com>
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: eca41cb78e83c1522a9d2e50f769805c94dc4558
      https://github.com/lxc/lxc/commit/eca41cb78e83c1522a9d2e50f769805c94dc4558
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/network.c
    M src/lxc/network.h
    M src/lxc/start.c

  Log Message:
  -----------
  network: remove netpipe

We use data_sock for all things we need to send around between parent and child
now. It doesn't make sense to have so many different pipes and sockets if one
will do just fine.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 9597e061fc86375a402a9d82b3dc586dec5a8003
      https://github.com/lxc/lxc/commit/9597e061fc86375a402a9d82b3dc586dec5a8003
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  lxc-user-nic: fix adding database entries

The code before inserted \0-bytes after every new line which made the db
basically unusable.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: eec13ca1b238344eb80f074e366e1510393cc0c1
      https://github.com/lxc/lxc/commit/eec13ca1b238344eb80f074e366e1510393cc0c1
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  lxc-user-nic: keep lines from other {users,links}

Assume the db contained the following entries:

    chb veth lxcbr0 veth1
    chb veth lxcbr0 veth2
    chb veth lxdbr0 veth3
    chb veth lxdbr0 veth2
    didi veth lxcbr0 veth4

And you request

    cull_entries("chb", "veth", "lxdbr0", "veth3");

lxc-user-nic would wipe any entries that did not match irrespective of whether
they existed or not. Let's fix that.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: bc0922628b8af091b2a701673798613164dc9d70
      https://github.com/lxc/lxc/commit/bc0922628b8af091b2a701673798613164dc9d70
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/lxc_user_nic.c
    M src/lxc/utils.c
    M src/lxc/utils.h

  Log Message:
  -----------
  utils: add lxc_nic_exists()

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 3bc79785a893c5616bd9691fc049b1dc693f61e6
      https://github.com/lxc/lxc/commit/3bc79785a893c5616bd9691fc049b1dc693f61e6
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  lxc-user-nic: bugfixes

Since find_line() was changed before count_entries() started counting lines
wrong. It would report maximum reached before you actually reached your alloted
maximum.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 9ffa2966753157dcbca874cb00bd8dc0ec9a4080
      https://github.com/lxc/lxc/commit/9ffa2966753157dcbca874cb00bd8dc0ec9a4080
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/network.c
    M src/lxc/start.c
    M src/lxc/start.h

  Log Message:
  -----------
  handler: root -> am_root

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: ccf3463cdc1dc248d17da9a848c2f934d79064c7
      https://github.com/lxc/lxc/commit/ccf3463cdc1dc248d17da9a848c2f934d79064c7
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/network.c
    M src/lxc/network.h
    M src/lxc/start.c

  Log Message:
  -----------
  network: user send()/recv()

Also move all functions to network.{c,h}.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: ed82f9f1a271272f1b9bd1b56564aae4eb153247
      https://github.com/lxc/lxc/commit/ed82f9f1a271272f1b9bd1b56564aae4eb153247
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/network.c

  Log Message:
  -----------
  network: fix grammar

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 8f84881b87d3fe649d426e4a5a3921033866c5e4
      https://github.com/lxc/lxc/commit/8f84881b87d3fe649d426e4a5a3921033866c5e4
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/criu.c
    M src/lxc/lxc_user_nic.c
    M src/lxc/network.c
    M src/lxc/network.h

  Log Message:
  -----------
  network: remove allocation from lxc_mkifname()

lxc_mkifname() really doesn't need to allocate any memory.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 7ef453d0c84d77b2cbf6a4ecb27d9afb83b5299b
      https://github.com/lxc/lxc/commit/7ef453d0c84d77b2cbf6a4ecb27d9afb83b5299b
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  lxc-user-nic: simplify

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 6069a230e912ef72c4d8ce0d5c5705fcf883404a
      https://github.com/lxc/lxc/commit/6069a230e912ef72c4d8ce0d5c5705fcf883404a
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/start.c

  Log Message:
  -----------
  conf: send ttys in batches of 2

I thought we could send all ttys at once but this limits the number of ttys
users can use because of iovec_len restrictions. So let's sent them in batches
of 2.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: d33c77e70ec870c0c665007abf1db40a537f2610
      https://github.com/lxc/lxc/commit/d33c77e70ec870c0c665007abf1db40a537f2610
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/start.c

  Log Message:
  -----------
  start: switch from SOCK_DGRAM to SOCK_STREAM

Writes < PIPE_BUF will be atomic. PIPE_BUF is guaranteed to be 512 by POSIX and
Linux guarantess 4096. Nothing we send around goes over this limit.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 0b96777a023ed7b9ee8844bea4e2fa895306b8db
      https://github.com/lxc/lxc/commit/0b96777a023ed7b9ee8844bea4e2fa895306b8db
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  conf: do not free static memory

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 3ffaab433eaace56264ae93d5448d52f69e16af8
      https://github.com/lxc/lxc/commit/3ffaab433eaace56264ae93d5448d52f69e16af8
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  conf: don't send ttys when none are configured

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 270e9a2a3c007773a871c27ca1d6e8c08c10f54c
      https://github.com/lxc/lxc/commit/270e9a2a3c007773a871c27ca1d6e8c08c10f54c
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/network.c
    M src/lxc/start.c

  Log Message:
  -----------
  start: don't let data_sock users close the fd

It is bad style to close an fd inside a function which didn't create it. Let's
rather close it transparently in start.c.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: f924cfc1c16ba63beebb542cfce9c9a532f13045
      https://github.com/lxc/lxc/commit/f924cfc1c16ba63beebb542cfce9c9a532f13045
  Author: Federico Briata <federico-pietro.briata at cnhind.com>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M src/lxc/criu.c

  Log Message:
  -----------
  criu: add cmp_version()

We cannot use strcmp(). Otherwise we incorrectly report e.g. that criu 2.12.1
is less than 2.8.

Signed-off-by: Federico Briata <federico-pietro.briata at cnhind.com>
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 9d6c5effc39ce01e6b9e9330f0f58649a04f0b62
      https://github.com/lxc/lxc/commit/9d6c5effc39ce01e6b9e9330f0f58649a04f0b62
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M src/lxc/start.c
    M src/lxc/start.h
    M src/lxc/sync.c

  Log Message:
  -----------
  start: document all handler fields

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 567d76118c1e7ffedfd3606c8db65d31c373b731
      https://github.com/lxc/lxc/commit/567d76118c1e7ffedfd3606c8db65d31c373b731
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  conf: record idmap that gets written

This will serve us well in the future!

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: f0ab9713f9d203d56bd258b33266818ed0c07d63
      https://github.com/lxc/lxc/commit/f0ab9713f9d203d56bd258b33266818ed0c07d63
  Author: Stéphane Graber <stgraber at stgraber.org>
  Date:   2017-09-10 (Sun, 10 Sep 2017)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/conf.h
    M src/lxc/confile.c
    M src/lxc/confile_utils.c
    M src/lxc/confile_utils.h
    M src/lxc/criu.c
    M src/lxc/lxc_user_nic.c
    M src/lxc/network.c
    M src/lxc/network.h
    M src/lxc/start.c
    M src/lxc/start.h
    M src/lxc/sync.c
    M src/lxc/utils.c
    M src/lxc/utils.h
    M templates/lxc-ubuntu.in

  Log Message:
  -----------
  Merge pull request #1781 from brauner/stable-2.0

stable 2.0: cherry-picks + delta reduction between master and stable 2.0


Compare: https://github.com/lxc/lxc/compare/d3e7b8ad181e...f0ab9713f9d2


More information about the lxc-devel mailing list