Commit Graph

6329 Commits

Author SHA1 Message Date
Felix Abecassis
81e38b0059 lxc-oci: cleanup temporary download directory if umoci is interrupted
Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
2017-11-30 22:51:38 -08:00
Christian Brauner
6370793188
Merge pull request #1955 from flx42/confile-fix-misc-issues
Fix errors in configuration file parsing
2017-11-29 12:41:39 +01:00
Felix Abecassis
44047b2b20 confile_utils: simplify lxc_config_net_hwaddr
In addition to the memory corruption fixed in ee3e84df78,
this function was also performing invalid memory accesses for the following inputs:
- `lxc.net`
- `lxc.net.`
- `lxc.net.0.`
- `lxc.network`
- `lxc.network.0.`

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
2017-11-28 20:41:51 -08:00
Felix Abecassis
24fa7df6f1 confile: error out if a network configuration key has no subkey
This prevent an infinite recursion in the case of "lxc.net.0. = a"

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
2017-11-28 20:41:51 -08:00
Felix Abecassis
26e92b0eab log: fix infinite loop with multiple lxc.log.syslog keys
This caused the linked list of appenders to loop on itself, creating
an infinite logging loop in `__lxc_log_append`.

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
2017-11-28 20:41:51 -08:00
Felix Abecassis
8bc6d5393c tests: add a function for negative netdev tests
Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
2017-11-28 20:40:45 -08:00
Felix Abecassis
327500d449 confile: fix memory leak
Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
2017-11-28 20:27:28 -08:00
Serge Hallyn
242146d9e4
Merge pull request #1932 from 3XX0/dhclient-hook
hooks: add dhclient hooks
2017-11-28 20:16:50 -06:00
Christian Brauner
29a012480d
Merge pull request #1958 from AustinReichert/tools-refactor-lxc-wait
tools/lxc_wait: removed internal logging
2017-11-29 02:32:35 +01:00
Christian Brauner
8410ae3d63
Merge pull request #1959 from AustinReichert/tools-refactor-lxc-usernsexec
tools/lxc_usernsexec: removed internal logging
2017-11-29 02:15:04 +01:00
Christian Brauner
c8947ca72e
Merge pull request #1960 from AustinReichert/tools-refactor-lxc-unfreeze
tools/lxc_unfreeze: removed internal logging
2017-11-29 02:03:01 +01:00
Christian Brauner
fdc50b06f8
Merge pull request #1961 from AustinReichert/tools-refactor-lxc-top
tools/lxc_top: removed internal logging
2017-11-29 02:01:30 +01:00
Christian Brauner
456e7d7eba
Merge pull request #1962 from AustinReichert/tools-refactor-lxc-stop
tools/lxc_stop: removed internal logging
2017-11-29 01:56:36 +01:00
Christian Brauner
7c3545948a
Merge pull request #1963 from AustinReichert/tools-refactor-lxc-start
tools/lxc_start: removed internal logging
2017-11-29 01:55:47 +01:00
Christian Brauner
7bb1469d90
Merge pull request #1964 from AustinReichert/tools-refactor-lxc-snapshot
tools/lxc_snapshot: removed internal logging
2017-11-29 01:54:47 +01:00
Christian Brauner
b4f5ab1942
Merge pull request #1966 from AustinReichert/tools-refactor-lxc-ls
tools/lxc_ls: remove internal logging
2017-11-29 01:54:16 +01:00
Christian Brauner
ca23fb473f
Merge pull request #1965 from AustinReichert/tools-refactor-lxc-monitor
tools/lxc_monitor: removed internal logging
2017-11-29 01:53:18 +01:00
Christian Brauner
0fac38afbd
Merge pull request #1967 from AustinReichert/tools-refactor-lxc-info
tools/lxc_info: removed internal logging
2017-11-29 01:52:47 +01:00
Christian Brauner
31b800d653
Merge pull request #1968 from AustinReichert/tools-refactor-lxc-freeze
tools/lxc_freeze: remove internal logging
2017-11-29 01:52:38 +01:00
Christian Brauner
1e325b760e
Merge pull request #1969 from AustinReichert/tools-refactor-lxc-execute
tools/lxc_execute: removed internal logging
2017-11-29 01:50:39 +01:00
Christian Brauner
896a3d4fbb
Merge pull request #1957 from AustinReichert/tools-refactor-lxc-unshare
tools/lxc_unshare: removed internal logging
2017-11-29 01:50:07 +01:00
Christian Brauner
0db85c5844
Merge pull request #1970 from AustinReichert/tools-refactor-lxc-device
tools/lxc_device: remove internal logging
2017-11-29 01:42:39 +01:00
Christian Brauner
dd9a1c4a5a
Merge pull request #1971 from AustinReichert/tools-refactor-lxc-destroy
tools/lxc_destroy: remove internal logging
2017-11-29 01:42:00 +01:00
Christian Brauner
4adf8ff4ba
Merge pull request #1972 from AustinReichert/tools-refactor-lxc-create
tools/lxc_create: remove internal logging
2017-11-29 01:41:36 +01:00
Christian Brauner
3d4605a45b
Merge pull request #1973 from AustinReichert/tools-refactor-lxc-copy
tools/lxc_copy: remove internal logging
2017-11-29 01:41:10 +01:00
Christian Brauner
5c70fa4bca
Merge pull request #1974 from AustinReichert/tools-refactor-lxc-console
tools/lxc_console: remove internal logging
2017-11-29 01:40:05 +01:00
Christian Brauner
76c0e5f8f2
Merge pull request #1975 from AustinReichert/tools-refactor-lxc-clone
tools/lxc_clone: remove internal logging
2017-11-29 01:39:42 +01:00
AustinReichert
bc1fc88d00 tools/lxc_wait: removed internal logging
Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
2017-11-28 17:55:53 -06:00
AustinReichert
3eaff0ba58 tools/lxc_usernsexec: removed internal logging
Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
2017-11-28 17:54:11 -06:00
AustinReichert
076d1ba7fb tools/lxc_unshare: removed internal logging
Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
2017-11-28 17:48:06 -06:00
AustinReichert
feb3402023 tools/lxc_unfreeze: removed internal logging
Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
2017-11-28 17:38:48 -06:00
AustinReichert
8052112c23 tools/lxc_top: removed internal logging
Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
2017-11-28 17:35:45 -06:00
AustinReichert
38d28c16d2 tools/lxc_stop: removed internal logging
Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
2017-11-28 17:29:25 -06:00
AustinReichert
e54ecee403 tools/lxc_start: removed internal logging
Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
2017-11-28 17:17:04 -06:00
AustinReichert
8457116379 tools/lxc_snapshot: removed internal logging
Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
2017-11-28 17:07:24 -06:00
AustinReichert
b4b4ff0b23 tools/lxc_monitor: removed internal logging
Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
2017-11-28 16:59:14 -06:00
AustinReichert
4a296c6378 tools/lxc_copy: remove internal logging
Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
2017-11-28 16:56:17 -06:00
AustinReichert
d36ae708d3 tools/lxc_ls: remove internal logging
Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
2017-11-28 16:50:16 -06:00
Christian Brauner
1c7222c084
btrfs: fix btrfs_snapshot()
Closes #1956.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
2017-11-28 22:44:40 +01:00
Christian Brauner
41dc71558e
storage: constify where possible
This was made necessary by changes to the overlay driver.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
2017-11-28 13:52:47 +01:00
Christian Brauner
ec5d663c3e
storage: remove unused declaration
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
2017-11-28 13:52:45 +01:00
Christian Brauner
06d0056c0a
storage: make storage_copy() cleaner
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
2017-11-28 13:52:43 +01:00
Christian Brauner
e9e29a33cf
lxccontainer: various container creation fixes
This is beneficial for LXD as well.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
2017-11-28 13:52:37 +01:00
Christian Brauner
8a388ed4fc
storage: make storage_init() smart and simplify
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
2017-11-28 13:52:35 +01:00
Christian Brauner
068aa488b6
storage: make storage_dir() smart
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
2017-11-28 13:52:27 +01:00
Christian Brauner
70d6bd97e6
loop: adapt to new config rootfs parser
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
2017-11-28 13:52:25 +01:00
Christian Brauner
09f6f8c4d4
overlay: adapt to new config rootfs parser
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
2017-11-28 13:52:23 +01:00
Christian Brauner
63c9ffa070
storage: pass down storage type
The configuration file parser now already detects the storage type so spare the
work and pass it down to the storage drivers.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
2017-11-28 13:52:21 +01:00
Christian Brauner
693dbdb975
confile: parse storage type
Split lxc.rootfs.path = <storage type>:<container path> into <storage-type> and
<container path> to set the storage type and rootfs path value correctly.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
2017-11-28 13:52:19 +01:00
Christian Brauner
ea7f6b29bc
criu: detect veth name
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
2017-11-28 13:52:15 +01:00