2
0
mirror of git://github.com/lxc/lxc synced 2025-09-05 06:15:13 +00:00
Commit Graph

5489 Commits

Author SHA1 Message Date
Christian Brauner
17a367d841 overlay: correctly restore from snapshot
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-01 20:24:03 +02:00
Christian Brauner
7f02248324 overlay: simplify logic
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:19 +02:00
Christian Brauner
70e95c8d73 overlay: correctly handle dependency tracking
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:19 +02:00
Christian Brauner
31b204e42c utils: rework lxc_deslashify()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:18 +02:00
Christian Brauner
56050adc92 aufs: mark deprecated
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:18 +02:00
Christian Brauner
79f4b264b6 rsync: remove obsolete helpers
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:18 +02:00
Christian Brauner
07db51a27c storage: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:18 +02:00
Christian Brauner
10bc186195 tree-wide: struct bdev -> struct lxc_storage
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:18 +02:00
Christian Brauner
28d832c4e4 storage: rename files "bdev" -> "storage"
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:18 +02:00
Christian Brauner
241978fac5 overlay: rework overlay storage driver
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:17 +02:00
Christian Brauner
3ef1df7c33 zfs: rework zfs storage driver
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:17 +02:00
Christian Brauner
f83dd99ebe storage: add rbd, zfs as block devices
When users create an unprivileged container as root they can use block devices.
However, we then need to perform a specific mount protocol in start.c which
requires that these block devices are correctly reported as block devices. So
let's do that.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:17 +02:00
Christian Brauner
3d2ae1e20f storage: make detect method return bool
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:17 +02:00
Christian Brauner
3b0e906f16 rbd: rework rbd storage driver
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:17 +02:00
Christian Brauner
7b22b3e97f rbd: rbd non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:17 +02:00
Christian Brauner
cd5f5e4869 loop: rework loop storage driver
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:16 +02:00
Christian Brauner
dd49809f8e btrfs: switch to new rsync helpers
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:16 +02:00
Christian Brauner
db3ac7ba3a storage: switch to new rsync functions
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:16 +02:00
Christian Brauner
301faec222 rsync: add new rsync functions
We will fade out the old helpers soon.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:16 +02:00
Christian Brauner
6f748a9791 bdev: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:16 +02:00
Christian Brauner
e20966be67 dir: improvements
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:16 +02:00
Christian Brauner
1eaff7fc4a dir: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:15 +02:00
Christian Brauner
d91e13d8b5 storage: rework lvm backend
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:15 +02:00
Christian Brauner
53e50ae80f storage: add arg to create_snapshot()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:15 +02:00
Christian Brauner
b196516bc9 btrfs: switch to btrfs_create_{clone,snapshot}()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:15 +02:00
Christian Brauner
805d9bf49c storage: add create_{clone,snapshot}()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:15 +02:00
Christian Brauner
fc0fd9a08b btrfs: simplify
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:15 +02:00
Christian Brauner
45dd65e796 btrfs: simplify
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:14 +02:00
Christian Brauner
7a9e0f3546 btrfs: only chown_mapped_root() if not btrfs
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:14 +02:00
Christian Brauner
3324c2557e btrfs: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:14 +02:00
Christian Brauner
35d7de5a39 btrfs: enable unprivileged snapshots
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:14 +02:00
Christian Brauner
e4a894d757 btrfs: export btrfs_snapshot_wrapper()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:14 +02:00
Christian Brauner
9edcd5ab7b btrfs: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:14 +02:00
Christian Brauner
eb0760f9d6 tools: remove empty snap directory
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:14 +02:00
Christian Brauner
ba11517564 overlay: simplify and adapt to "overlay"
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:13 +02:00
Christian Brauner
02b5e381d5 lvm: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:13 +02:00
Christian Brauner
0801b28033 btrfs: simplify + bugfix
Closes #1698.
Closes #1703.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:13 +02:00
Christian Brauner
90b366fc1f lxccontainer: use snprintf()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:13 +02:00
Christian Brauner
5e78e16af0 storage: default to orig type on identical paths
otherwise default to "dir"

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 23:34:11 +02:00
Stéphane Graber
d1f811d5de Merge pull request #1721 from brauner/2017-07-30/fix_saved_config_handling
network parser fixes
2017-07-31 15:16:10 -04:00
Christian Brauner
bb461dcca6 test: test for invalid network key
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-31 19:57:57 +02:00
Christian Brauner
dd871fa00a Merge pull request #1720 from hallyn/2017-07-29/cg
Fix some bugs in #1719
2017-07-30 16:15:43 -04:00
Christian Brauner
4222a9f44b lxccontainer: clear whole indexed networks
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-30 21:45:36 +02:00
Christian Brauner
31ee747baa confile: use deindexed network keys
When we are passed a network key like "lxc.net.[i].ipv4.address" we need to
make sure that we pass the deindexed key "lxc.net.ipv4.address" to the
{get,clr,set} methods otherwise we'll end up in an endless loop.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-30 21:42:40 +02:00
Serge Hallyn
2c2d6c49dd Fix some bugs in #1719
In particular, any text (like a #comment) following the mode
would end up in our mode line.

Signed-off-by: Serge Hallyn <serge@hallyn.com>
2017-07-29 17:38:43 -05:00
Christian Brauner
1135b35b6d Merge pull request #1719 from hallyn/2017-07-28/cg
Fix up c8bf519d to fit our coding style
2017-07-29 23:03:55 +02:00
Serge Hallyn
72add15524 Fix up c8bf519d to fit our coding style
Also reduce the number of mallocs.

Signed-off-by: Serge Hallyn <serge@hallyn.com>
2017-07-29 14:45:36 -05:00
Serge Hallyn
da7a897ee2 Merge pull request #1708 from aeris/master
Allow full path in lxc.devices.allow
2017-07-28 22:31:54 -05:00
Christian Brauner
5fddde036c Merge pull request #1717 from hallyn/harri1
Use "rsync -SHaAX" to copy the cached rootfs into place
2017-07-28 22:10:37 +02:00
Harald Dunkel
6273aef16b Use "rsync -SHaAX" to copy the cached rootfs into place
(updated by Serge to also handle hte new lxc-fedora{-legacy{.in
templates)

Signed-off-by: Harald Dunkel <harri@afaics.de>
Signed-off-by: Serge Hallyn <serge@hallyn.com>
Acked-by: Serge Hallyn <serge@hallyn.com>
2017-07-28 13:09:36 -05:00