templates/ubuntu: conditionally move upstart ssh job, as it is now optional.

Mimic the code from the debian template.

Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>

Merge pull request #1763 from brauner/2017-08-28/lxc_2.1_upgrade_script

lxc-update-config: handle legacy networks

lxc-update-config: handle legacy networks

Older instances of liblxc allowed to specify networks like this:

lxc.network.type = veth
lxc.network.flags = up
lxc.network.link = lxdbr0
lxc.network.name= eth0

lxc.network.type = veth
lxc.network.flags = up
lxc.network.link = lxdbr0
lxc.network.name = eth1

Each occurrence of "lxc.network.type" indicated the definition of a new
network. This syntax is not allowed in newer liblxc instances. Instead, network
must carry an index. So in new liblxc these two networks would be translated to:

lxc.net.0.type = veth
lxc.net.0.flags = up
lxc.net.0.link = lxdbr0
lxc.net.0.name= eth0

lxc.net.1.type = veth
lxc.net.1.flags = up
lxc.net.1.link = lxdbr0
lxc.net.1.name = eth1

The update script did not handle this case correctly. It should now.

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

Merge pull request #1757 from brauner/2017-08-10/further_lxc_2.1_preparations

further lxc 2.1 preparations

attach: non-functional changes

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

arguments: non-functional changes

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

af_unix: non-functional changes

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

rtnl: non-functional changes

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

conf: do not check union on wrong net type

This will obviously not work.

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

conf: refactor network deletion

I'm ashamed at how aweful my previous code was.

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

openvswitch: delete ports intelligently

So far, when creating veth devices attached to openvswitch bridges we used to
fork() off a thread on container startup. This thread was kept around until the
container shut down. I have no good explanation why we did it that why but it's
certainly not necessary. Instead, let's fork() off the thread on container
shutdown to delete the veth.

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

conf: log lxc-user-nic output

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

conf: non-functional changes

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

lxc-user-nic: non-functional changes

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

network: non-functional changes

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

network: log cleanup thread pid for openswitch

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

tests: add tests for lxc.cgroup.dir

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

confile: add "lxc.cgroup.dir"

"lxc.cgroup.dir" can be used to set the name of the directory the container's
cgroup will be created in. For example, setting

    lxc.uts.name = c1
    lxc.cgroup.dir = lxd

would make liblxc create the cgroup

    lxd/c1

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

Merge pull request #1758 from carnil/master

Use deb.debian.org as the default Debian mirror

Use deb.debian.org as the default Debian mirror

The httpredir.debian.org service has been discontinued in favour of
deb.debian.org and httpredir.debian.org now redirects to deb.debian.org.

https://lists.debian.org/debian-mirrors/2017/02/msg00000.html
https://wiki.debian.org/DebianGeoMirror#httpredir.debian.org_.2F_http.debian.net

Cf. https://bugs.debian.org/872719

Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>

cgroups: non-functional changes

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

conf: non-functional fixup

Surfaced while building lxc-2.0.8 on e2k architecture with lcc,
looks like its -Wall is more pedantic than gcc's:

lcc: "conf.c", line 1514: error: unrecognized character escape sequence
          [-Werror]
        DEBUG("created directory for console and tty devices at \%s\"", path);
                                                                ^
 in expansion of macro "DEBUG" at line 1514

Another byte is a leading whitespace fix while at that.

Signed-off-by: Michael Shigorin <mike@altlinux.org>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>

tree-wide: non-functional changes

- replace all "//" with "/* */"

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

Merge pull request #1756 from brauner/2017-08-10/further_lxc_2.1_preparations

further lxc 2.1 preparations

tools: add additional cgroup checks

- list all cgroup v1 mountpoints
- list all cgroup v2 mountpoints
- report "missing" when no mountpoint for the systemd controller was found
- report "missing" when no mountpoint for the freezer controller was found

Closes https://github.com/lxc/lxd/issues/3687.

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

confile: non-functional changes

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

confile: non-functional changes

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

confile: non-functional changes

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

confile: non-functional changes

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

Merge pull request #1755 from brauner/2017-08-10/further_lxc_2.1_preparations

templates: remove legacy key from busybox

templates: remove legacy key from busybox

lxc.rebootsignal -> lxc.signal.reboot

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

Merge pull request #1750 from brauner/2017-08-10/further_lxc_2.1_preparations

further lxc 2.1. preparations

conf{,ile}: warn user once about legacy config

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

tools: use "which"

Somehow "type" doesn't really work.

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

tools: add lxc-update-config.in

This tool can be used to switch from a pre 2.1 to a 2.1 config file.

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

confile: lxc.id_map --> lxc.idmap

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

Merge pull request #1752 from stgraber/master

Add CONFIG_NETFILTER_XT_MATCH_COMMENT to lxc-checkconfig

Add CONFIG_NETFILTER_XT_MATCH_COMMENT to lxc-checkconfig

Closes https://github.com/lxc/lxd/issues/3685

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

test: add test to get subkeys

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

confile: list namespaced keys

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

confile: lxc_getconfig() -> lxc_get_config()

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

Merge pull request #1746 from brauner/2017-08-10/further_lxc_2.1_preparations

further lxc 2.1 preparations

confile: improve get_network_config_ops()

- handle lxc.net.<idx> keys without any subkey
- allow caller to pass NULL if caller doesn't need to retrieve deindexed key

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

storage: add overlay as valid backend

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

Merge pull request #1739 from keloyang/mem-leak

Fix mem leak with realpath

Revert "debian: jessie and stretch keyring support"

This reverts commit 87eacd4d49033d38d7e3257046079a77fd60e588.

While that commit looks right, the actual signing key doesn't match and
debootstrap therefore fails to bootstrap, as can be seen here:

https://jenkins.linuxcontainers.org/view/All/job/lxc-template-debian/

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

Fix mem leak with realpath

Signed-off-by: Shukui Yang <yangshukui@huawei.com>

confile: move lxc_list_net()

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

confile: lxc_listconfigs -> lxc_list_config_items

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

confile: non-functional changes

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

confile: rework lxc_list_net()

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

confile: non-functional changes

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

confile: cleanup

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

Merge pull request #1738 from brauner/2017-08-10/fix_android

android: fix includes

android: fix includes

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

Merge pull request #1736 from brauner/2017-08-08/fix_gcc_warnings

cgfsng: do not use uninitialized variable

lxccontainer: remove 5s timeout

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

cgfsng: do not use uninitialized variable

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

Merge pull request #1735 from fanyeren/patch-20

debian: jessie and stretch keyring support

debian: jessie and stretch keyring support

Signed-off-by: feng xiahou xiahoufeng@yahoo.com

debian: Add buster as a valid release

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

Merge pull request #1729 from brauner/2017-08-03/ensure_cgroup_cleanup_before_restart

start: ensure cgroups are cleaned up

start: ensure cgroups are cleaned up

When a container is marked as being in STOPPED state it is possible for another
thread to start it again even though not all cleanup operations for that
container have finished. This is not a problem for most things like sockets and
friends which are unique to the container. It is however a problem for cgroups
which are named after that container in that we cause our cgroup driver to
waste cpu cycles finding a new cgroup name.

Closes  #1726.

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

Merge pull request #1727 from brauner/2017-08-02/fix_travis

travis: fix builds

Merge pull request #1705 from brauner/2017-07-15/fix_clone

storage: rework storage drivers

travis: fix builds

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

Merge pull request #1725 from brauner/2017-08-01/handle_pre_mounted_dev

conf: NOTICE() on mounts on container's /dev

userns.conf: remove obsolete bind-mounts

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

conf: NOTICE() on mounts on container's /dev

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

utils: rework lxc_deslashify()

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

conf: lxc_fill_autodev()

non-functional changes

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

utils: switch to has_fs_type()

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

utils: add has_fs_type() + is_fs_type()

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

conf: mount_autodev()

non-functional changes

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

conf: lxchook_names

non-functional changes

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

conf: mount_entry()

non-functional changes

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

conf: cull_mntent_opt()

non-functional changes

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

conf: mount_entry_create_dir_file()

bugfixes

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

android: include custom mntent

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

conf: mount_entry_on_generic()

non-functional changes

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

conf: mount_entry_on_systemfs()

non-functional changes

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

conf: mount_entry_on_absolute_rootfs()

non-functional changes

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

conf: setup_mount_entries()

non-functional changes

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

conf: make_anonymous_mount_file()

non-functional changes

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

conf: setup_mount()

non-functional changes

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

conf: mount_file_entries()

non-functional changes

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

Merge pull request #1723 from brauner/2017-07-31/remove_utmp_watch

start: remove utmp watch

Merge pull request #1722 from brauner/2017-07-31/devpts_use_max_mount_option

devpts: use max=<count> option on mount

Merge pull request #1724 from GamerSource/opensuse-template-improvements-v2

Opensuse template improvements

overlay: correctly restore from snapshot

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

devpts: use max=<count> option on mount

This will only work with kernels >= 3.4

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

start: remove utmp watch

Closes #1616.

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

templates/opensuse: support leap 42.3

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

templates/opensuse: getty.target.wants does not always exists

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

templates/opensuse: fix tumbleweed software selection

tumbleweed needs a newer version for a few packages, namely:
* liblua5_3
* bncurses6
* breadline7

As Leap it also has no dhcpd, but udhcp which gets pulled in already.
Further iproute2 and net-tools need manual instalation.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

templates/opensuse: tumbleweed has no update repo

As tumbleweed is a rolling release it has not update repository.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

overlay: simplify logic

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

overlay: correctly handle dependency tracking

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

utils: rework lxc_deslashify()

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

aufs: mark deprecated

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