Commit Graph

5283 Commits

Author SHA1 Message Date
Christian Brauner
5485782f9e
confile: add getter for lxc.tty
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-31 10:03:26 +02:00
Christian Brauner
bdf91ab413
confile: add getter for lxc.pts
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-31 10:03:26 +02:00
Christian Brauner
7b992a3ee7
confile: add getter for lxc.arch
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-31 10:03:25 +02:00
Christian Brauner
713046e358
confile: prefix setters with "set_"
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-31 10:03:25 +02:00
Christian Brauner
821a76f19c
confile: add prototype for getter
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-31 10:03:25 +02:00
Christian Brauner
d37f7cd727
confile: extend call back system
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-31 10:03:25 +02:00
Christian Brauner
72be9ed7b2
confile: allow to get lxc.kmsg
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:09 +02:00
Christian Brauner
1a4c89acbc
confile: allow to get lxc.autodev
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:08 +02:00
Christian Brauner
d577bad109
confile: allow to retrieve lxc.stopsignal
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:08 +02:00
Christian Brauner
bbb8adb13f
confile: allow to retrieve lxc.rebootsignal
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:08 +02:00
Christian Brauner
8beda89e6a
confile: allow to retrieve lxc.haltsignal
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:08 +02:00
Christian Brauner
0df888ba88
confile: add lxc_get_idmaps()
lxc_get_idmaps() retrieves the idmaps defined for the container. If multiple id
mappings are defined they will be separated by newlines.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:08 +02:00
Christian Brauner
34a7a4c6aa
confile: properly parse lxc.idmap entries
scanf() really isn't appropriate for this.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:07 +02:00
Christian Brauner
681188c14e
utils: add lxc_safe_ulong()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:07 +02:00
Christian Brauner
cf3f8bf605
confile: config_no_new_privs()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:07 +02:00
Christian Brauner
3c6cf53ae9
confile: config_ephemeral()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:07 +02:00
Christian Brauner
00cd803902
confile: config_utsname()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:06 +02:00
Christian Brauner
355c5701bf
confile: config_includefile()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:06 +02:00
Christian Brauner
46f3de306f
confile: config_fstab()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:06 +02:00
Christian Brauner
4100d1a786
confile: config_stopsignal()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:06 +02:00
Christian Brauner
18fcee440b
confile: config_rebootsignal()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:06 +02:00
Christian Brauner
c1a6460355
confile: config_haltsignal()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:05 +02:00
Christian Brauner
1045031e34
confile: config_autodev()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:05 +02:00
Christian Brauner
575b9745b7
confile: config_loglevel()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:05 +02:00
Christian Brauner
cccfa75832
confile: config_lsm_aa_incomplete()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:05 +02:00
Christian Brauner
3d6b7fdc7c
confile: config_kmsg()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:05 +02:00
Christian Brauner
cb508ee8e1
confile: config_tty()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:04 +02:00
Christian Brauner
4ad9cd26bd
confile: config_monitor()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:04 +02:00
Christian Brauner
ebb80f95b8
confile: config_start()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:04 +02:00
Christian Brauner
ec200ce926
confile: config_pts()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:04 +02:00
Christian Brauner
2debb6e69c
confile: config_init_gid()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:04 +02:00
Christian Brauner
2e7cde4044
confile: config_init_uid()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:03 +02:00
Christian Brauner
c7b15d1e65
conf: move clearing config items into one place
Let's place lxc_get_config_item() and lxc_clear_config_item() into a single
place. This causes less confusion, less looking around and makes it clear that
both must be implemented when adding new configuration items.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:03 +02:00
Christian Brauner
ee10a69cfc
confile: config_syslog()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:03 +02:00
Christian Brauner
151d2da2dd
confile: do not write out trailing spaces
So far do_append_unexp_config_line() wrote out a trailing space each time the
config item value was empty. This is a problem a) when we later on parse the
written out config file we need to remove trailing spaces and b).

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 18:43:03 +02:00
Christian Brauner
b316d20945
network: don't delete net devs we didn't create
When we didn't create a net dev we should make sure that we don't delete it.  We
can simply check whether we have index for it. If not, we didn't create it.

Closes #1600.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 10:48:26 +02:00
Christian Brauner
f4f52cb53c
conf: use run_command for lxc-usernsexec
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 09:11:47 +02:00
Christian Brauner
99d4336537
conf: allow writing uid mappings with euid != 0
In case unprivileged users run containers via execute() or a start*() there are
valid cases where they may only want to map their own {g,u}id. Let's not block
them from doing so by requiring geteuid() == 0.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 09:11:47 +02:00
Christian Brauner
986ef93023
conf: rework lxc_map_ids()
Especially, in case the new{g,u}idmap is used we should try to gather
std{err,out} on error to better debug what is going on.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 09:11:47 +02:00
Christian Brauner
ea3a694fe1
utils: add run_command
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 09:11:47 +02:00
Christian Brauner
290531805e
conf: improve write_id_mapping()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 09:11:42 +02:00
Christian Brauner
bc80f0980b
conf: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-30 09:04:01 +02:00
Christian Brauner
8644419448
conf: clear lxc.syslog
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-29 17:14:15 +02:00
Christian Brauner
0b3c58384e
conf: clear lxc.include
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-29 17:14:15 +02:00
Christian Brauner
8092684526
confile: config_no_new_privs()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-29 17:14:14 +02:00
Christian Brauner
7ca56b841a
confile: config_syslog()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-29 17:14:14 +02:00
Christian Brauner
78304622dd
confile: config_ephemeral()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-29 17:14:14 +02:00
Christian Brauner
1939e73dc9
confile: config_utsname()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-29 17:14:14 +02:00
Christian Brauner
b822343941
confile: config_rootfs_backend()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-29 17:14:13 +02:00
Christian Brauner
616422f17d
confile: config_includefile()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-05-29 16:20:44 +02:00