The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/1756
This e-mail was sent by the LXC bot, direct replies will not reach the author unless they happen to be subscribed to this list. === Description (from pull-request) === Signed-off-by: Christian Brauner <[email protected]>
From 861d1adaae13b76ff8d6802746c10ebf798f2370 Mon Sep 17 00:00:00 2001 From: Christian Brauner <[email protected]> Date: Tue, 22 Aug 2017 11:53:29 +0200 Subject: [PATCH 1/2] confile: non-functional changes Signed-off-by: Christian Brauner <[email protected]> --- src/lxc/confile.c | 19 +++++++++---------- src/lxc/confile.h | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/lxc/confile.c b/src/lxc/confile.c index 82de6979a..5c61e6edf 100644 --- a/src/lxc/confile.c +++ b/src/lxc/confile.c @@ -68,14 +68,12 @@ lxc_log_define(lxc_confile, lxc); -#define lxc_config_define(name) \ - static int set_config_##name(const char *, const char *, \ - struct lxc_conf *, void *); \ - static int get_config_##name(const char *, char *, int, \ - struct lxc_conf *, void *); \ - static int clr_config_##name(const char *, struct lxc_conf *, \ - void *); - +#define lxc_config_define(name) \ + static int set_config_##name(const char *, const char *, \ + struct lxc_conf *, void *); \ + static int get_config_##name(const char *, char *, int, \ + struct lxc_conf *, void *); \ + static int clr_config_##name(const char *, struct lxc_conf *, void *); lxc_config_define(personality); lxc_config_define(pty_max); @@ -2054,8 +2052,9 @@ static int parse_line(char *buffer, void *data) * legacy configuration item in the configuration file and then * an update is required. */ - fprintf(stderr, "The configuration file contains legacy configuration keys.\n" - "Please update your configuration file!\n"); + fprintf(stderr, "The configuration file contains legacy " + "configuration keys.\nPlease update your " + "configuration file!\n"); } /* [END]: REMOVE IN LXC 3.0 */ diff --git a/src/lxc/confile.h b/src/lxc/confile.h index f939c61c9..d50217860 100644 --- a/src/lxc/confile.h +++ b/src/lxc/confile.h @@ -26,9 +26,9 @@ #ifndef __LXC_CONFILE_H #define __LXC_CONFILE_H +#include <stdbool.h> #include <stdio.h> #include <lxc/attach_options.h> -#include <stdbool.h> struct lxc_conf; struct lxc_list; From 7a073d63ea3bd8f08bc435916d38087b29ed6999 Mon Sep 17 00:00:00 2001 From: Christian Brauner <[email protected]> Date: Tue, 22 Aug 2017 12:05:37 +0200 Subject: [PATCH 2/2] confile: non-functional changes Signed-off-by: Christian Brauner <[email protected]> --- src/lxc/confile.c | 149 +++++++++++++++++++++++------------------------------- 1 file changed, 64 insertions(+), 85 deletions(-) diff --git a/src/lxc/confile.c b/src/lxc/confile.c index 5c61e6edf..00486f4a7 100644 --- a/src/lxc/confile.c +++ b/src/lxc/confile.c @@ -137,56 +137,86 @@ lxc_config_define(prlimit); static struct lxc_config_t config[] = { /* REMOVE in LXC 3.0 */ { "lxc.arch", false, set_config_personality, get_config_personality, clr_config_personality, }, - { "lxc.pty.max", false, set_config_pty_max, get_config_pty_max, clr_config_pty_max, }, - { "lxc.tty.dir", false, set_config_tty_dir, get_config_tty_dir, clr_config_tty_dir, }, - { "lxc.tty.max", false, set_config_tty_max, get_config_tty_max, clr_config_tty_max, }, - - /* [START]: REMOVE IN LXC 3.0 */ - { "lxc.pts", true, set_config_pty_max, get_config_pty_max, clr_config_pty_max, }, - { "lxc.devttydir", true, set_config_tty_dir, get_config_tty_dir, clr_config_tty_dir, }, - { "lxc.tty", true, set_config_tty_max, get_config_tty_max, clr_config_tty_max, }, - /* [END]: REMOVE IN LXC 3.0 */ - { "lxc.apparmor.profile", false, set_config_apparmor_profile, get_config_apparmor_profile, clr_config_apparmor_profile, }, { "lxc.apparmor.allow_incomplete", false, set_config_apparmor_allow_incomplete, get_config_apparmor_allow_incomplete, clr_config_apparmor_allow_incomplete, }, - { "lxc.selinux.context", false, set_config_selinux_context, get_config_selinux_context, clr_config_selinux_context, }, - - /* [START]: REMOVE IN LXC 3.0 */ - { "lxc.aa_profile", true, set_config_lsm_aa_profile, get_config_lsm_aa_profile, clr_config_lsm_aa_profile, }, - { "lxc.aa_allow_incomplete", true, set_config_lsm_aa_incomplete, get_config_lsm_aa_incomplete, clr_config_lsm_aa_incomplete, }, - { "lxc.se_context", true, set_config_lsm_se_context, get_config_lsm_se_context, clr_config_lsm_se_context, }, - /* [END]: REMOVE IN LXC 3.0 */ - + { "lxc.autodev", false, set_config_autodev, get_config_autodev, clr_config_autodev, }, + { "lxc.cap.drop", false, set_config_cap_drop, get_config_cap_drop, clr_config_cap_drop, }, + { "lxc.cap.keep", false, set_config_cap_keep, get_config_cap_keep, clr_config_cap_keep, }, { "lxc.cgroup", false, set_config_cgroup, get_config_cgroup, clr_config_cgroup, }, + { "lxc.console.logfile", false, set_config_console_logfile, get_config_console_logfile, clr_config_console_logfile, }, + { "lxc.console.path", false, set_config_console_path, get_config_console_path, clr_config_console_path, }, + { "lxc.environment", false, set_config_environment, get_config_environment, clr_config_environment, }, + { "lxc.ephemeral", false, set_config_ephemeral, get_config_ephemeral, clr_config_ephemeral, }, + { "lxc.group", false, set_config_group, get_config_group, clr_config_group, }, + { "lxc.hook.autodev", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, + { "lxc.hook.clone", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, + { "lxc.hook.destroy", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, + { "lxc.hook.mount", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, + { "lxc.hook.post-stop", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, + { "lxc.hook.pre-start", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, + { "lxc.hook.pre-mount", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, + { "lxc.hook.start", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, + { "lxc.hook.stop", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, + { "lxc.hook", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, { "lxc.idmap", false, set_config_idmaps, get_config_idmaps, clr_config_idmaps, }, - { "lxc.mount.entry", false, set_config_mount, get_config_mount, clr_config_mount, }, + { "lxc.include", false, set_config_includefiles, get_config_includefiles, clr_config_includefiles, }, + { "lxc.init.cmd", false, set_config_init_cmd, get_config_init_cmd, clr_config_init_cmd, }, + { "lxc.init.gid", false, set_config_init_gid, get_config_init_gid, clr_config_init_gid, }, + { "lxc.init.uid", false, set_config_init_uid, get_config_init_uid, clr_config_init_uid, }, + { "lxc.log.file", false, set_config_log_file, get_config_log_file, clr_config_log_file, }, + { "lxc.log.level", false, set_config_log_level, get_config_log_level, clr_config_log_level, }, + { "lxc.log.syslog", false, set_config_log_syslog, get_config_log_syslog, clr_config_log_syslog, }, + { "lxc.monitor.unshare", false, set_config_monitor, get_config_monitor, clr_config_monitor, }, { "lxc.mount.auto", false, set_config_mount_auto, get_config_mount_auto, clr_config_mount_auto, }, + { "lxc.mount.entry", false, set_config_mount, get_config_mount, clr_config_mount, }, { "lxc.mount.fstab", false, set_config_mount_fstab, get_config_mount_fstab, clr_config_mount_fstab, }, + { "lxc.net.flags", false, set_config_net_flags, get_config_net_flags, clr_config_net_flags, }, + { "lxc.net.hwaddr", false, set_config_net_hwaddr, get_config_net_hwaddr, clr_config_net_hwaddr, }, + { "lxc.net.ipv4.address", false, set_config_net_ipv4_address, get_config_net_ipv4_address, clr_config_net_ipv4_address, }, + { "lxc.net.ipv4.gateway", false, set_config_net_ipv4_gateway, get_config_net_ipv4_gateway, clr_config_net_ipv4_gateway, }, + { "lxc.net.ipv6.address", false, set_config_net_ipv6_address, get_config_net_ipv6_address, clr_config_net_ipv6_address, }, + { "lxc.net.ipv6.gateway", false, set_config_net_ipv6_gateway, get_config_net_ipv6_gateway, clr_config_net_ipv6_gateway, }, + { "lxc.net.link", false, set_config_net_link, get_config_net_link, clr_config_net_link, }, + { "lxc.net.macvlan.mode", false, set_config_net_macvlan_mode, get_config_net_macvlan_mode, clr_config_net_macvlan_mode, }, + { "lxc.net.mtu", false, set_config_net_mtu, get_config_net_mtu, clr_config_net_mtu, }, + { "lxc.net.name", false, set_config_net_name, get_config_net_name, clr_config_net_name, }, + { "lxc.net.script.down", false, set_config_net_script_down, get_config_net_script_down, clr_config_net_script_down, }, + { "lxc.net.script.up", false, set_config_net_script_up, get_config_net_script_up, clr_config_net_script_up, }, + { "lxc.net.type", false, set_config_net_type, get_config_net_type, clr_config_net_type, }, + { "lxc.net.vlan.id", false, set_config_net_vlan_id, get_config_net_vlan_id, clr_config_net_vlan_id, }, + { "lxc.net.veth.pair", false, set_config_net_veth_pair, get_config_net_veth_pair, clr_config_net_veth_pair, }, + { "lxc.net.", false, set_config_net_nic, get_config_net_nic, clr_config_net_nic, }, + { "lxc.net", false, set_config_net, get_config_net, clr_config_net, }, + { "lxc.no_new_privs", false, set_config_no_new_privs, get_config_no_new_privs, clr_config_no_new_privs, }, + { "lxc.prlimit", false, set_config_prlimit, get_config_prlimit, clr_config_prlimit, }, + { "lxc.pty.max", false, set_config_pty_max, get_config_pty_max, clr_config_pty_max, }, { "lxc.rootfs.mount", false, set_config_rootfs_mount, get_config_rootfs_mount, clr_config_rootfs_mount, }, { "lxc.rootfs.options", false, set_config_rootfs_options, get_config_rootfs_options, clr_config_rootfs_options, }, { "lxc.rootfs.path", false, set_config_rootfs_path, get_config_rootfs_path, clr_config_rootfs_path, }, + { "lxc.seccomp.profile", false, set_config_seccomp_profile, get_config_seccomp_profile, clr_config_seccomp_profile, }, + { "lxc.selinux.context", false, set_config_selinux_context, get_config_selinux_context, clr_config_selinux_context, }, + { "lxc.signal.halt", false, set_config_signal_halt, get_config_signal_halt, clr_config_signal_halt, }, + { "lxc.signal.reboot", false, set_config_signal_reboot, get_config_signal_reboot, clr_config_signal_reboot, }, + { "lxc.signal.stop", false, set_config_signal_stop, get_config_signal_stop, clr_config_signal_stop, }, + { "lxc.start.auto", false, set_config_start, get_config_start, clr_config_start, }, + { "lxc.start.delay", false, set_config_start, get_config_start, clr_config_start, }, + { "lxc.start.order", false, set_config_start, get_config_start, clr_config_start, }, + { "lxc.tty.dir", false, set_config_tty_dir, get_config_tty_dir, clr_config_tty_dir, }, + { "lxc.tty.max", false, set_config_tty_max, get_config_tty_max, clr_config_tty_max, }, + { "lxc.uts.name", false, set_config_uts_name, get_config_uts_name, clr_config_uts_name, }, /* [START]: REMOVE IN LXC 3.0 */ + { "lxc.pts", true, set_config_pty_max, get_config_pty_max, clr_config_pty_max, }, + { "lxc.devttydir", true, set_config_tty_dir, get_config_tty_dir, clr_config_tty_dir, }, + { "lxc.tty", true, set_config_tty_max, get_config_tty_max, clr_config_tty_max, }, + { "lxc.aa_profile", true, set_config_lsm_aa_profile, get_config_lsm_aa_profile, clr_config_lsm_aa_profile, }, + { "lxc.aa_allow_incomplete", true, set_config_lsm_aa_incomplete, get_config_lsm_aa_incomplete, clr_config_lsm_aa_incomplete, }, + { "lxc.se_context", true, set_config_lsm_se_context, get_config_lsm_se_context, clr_config_lsm_se_context, }, { "lxc.id_map", true, set_config_idmaps, get_config_idmaps, clr_config_idmaps, }, { "lxc.mount", true, set_config_mount_fstab, get_config_mount_fstab, clr_config_mount_fstab, }, { "lxc.rootfs.backend", true, set_config_rootfs_backend, get_config_rootfs_backend, clr_config_rootfs_backend, }, { "lxc.rootfs", true, set_config_rootfs_path, get_config_rootfs_path, clr_config_rootfs_path, }, { "lxc.utsname", true, set_config_uts_name, get_config_uts_name, clr_config_uts_name, }, - /* [END]: REMOVE IN LXC 3.0 */ - - { "lxc.uts.name", false, set_config_uts_name, get_config_uts_name, clr_config_uts_name, }, - { "lxc.hook.pre-start", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, - { "lxc.hook.pre-mount", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, - { "lxc.hook.mount", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, - { "lxc.hook.autodev", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, - { "lxc.hook.start", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, - { "lxc.hook.stop", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, - { "lxc.hook.post-stop", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, - { "lxc.hook.clone", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, - { "lxc.hook.destroy", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, - { "lxc.hook", false, set_config_hooks, get_config_hooks, clr_config_hooks, }, - - /* [START]: REMOVE IN LXC 3.0 */ { "lxc.network.type", true, set_config_network_legacy_type, get_config_network_legacy_item, clr_config_network_legacy_item, }, { "lxc.network.flags", true, set_config_network_legacy_flags, get_config_network_legacy_item, clr_config_network_legacy_item, }, { "lxc.network.link", true, set_config_network_legacy_link, get_config_network_legacy_item, clr_config_network_legacy_item, }, @@ -204,54 +234,11 @@ static struct lxc_config_t config[] = { { "lxc.network.ipv6", true, set_config_network_legacy_ipv6, get_config_network_legacy_item, clr_config_network_legacy_item, }, { "lxc.network.", true, set_config_network_legacy_nic, get_config_network_legacy_item, clr_config_network_legacy_item, }, { "lxc.network", true, set_config_network_legacy, get_config_network_legacy, clr_config_network_legacy, }, - /* [END]: REMOVE IN LXC 3.0 */ - - { "lxc.net.type", false, set_config_net_type, get_config_net_type, clr_config_net_type, }, - { "lxc.net.flags", false, set_config_net_flags, get_config_net_flags, clr_config_net_flags, }, - { "lxc.net.link", false, set_config_net_link, get_config_net_link, clr_config_net_link, }, - { "lxc.net.name", false, set_config_net_name, get_config_net_name, clr_config_net_name, }, - { "lxc.net.macvlan.mode", false, set_config_net_macvlan_mode, get_config_net_macvlan_mode, clr_config_net_macvlan_mode, }, - { "lxc.net.veth.pair", false, set_config_net_veth_pair, get_config_net_veth_pair, clr_config_net_veth_pair, }, - { "lxc.net.script.up", false, set_config_net_script_up, get_config_net_script_up, clr_config_net_script_up, }, - { "lxc.net.script.down", false, set_config_net_script_down, get_config_net_script_down, clr_config_net_script_down, }, - { "lxc.net.hwaddr", false, set_config_net_hwaddr, get_config_net_hwaddr, clr_config_net_hwaddr, }, - { "lxc.net.mtu", false, set_config_net_mtu, get_config_net_mtu, clr_config_net_mtu, }, - { "lxc.net.vlan.id", false, set_config_net_vlan_id, get_config_net_vlan_id, clr_config_net_vlan_id, }, - { "lxc.net.ipv4.gateway", false, set_config_net_ipv4_gateway, get_config_net_ipv4_gateway, clr_config_net_ipv4_gateway, }, - { "lxc.net.ipv4.address", false, set_config_net_ipv4_address, get_config_net_ipv4_address, clr_config_net_ipv4_address, }, - { "lxc.net.ipv6.gateway", false, set_config_net_ipv6_gateway, get_config_net_ipv6_gateway, clr_config_net_ipv6_gateway, }, - { "lxc.net.ipv6.address", false, set_config_net_ipv6_address, get_config_net_ipv6_address, clr_config_net_ipv6_address, }, - { "lxc.net.", false, set_config_net_nic, get_config_net_nic, clr_config_net_nic, }, - { "lxc.net", false, set_config_net, get_config_net, clr_config_net, }, - { "lxc.cap.drop", false, set_config_cap_drop, get_config_cap_drop, clr_config_cap_drop, }, - { "lxc.cap.keep", false, set_config_cap_keep, get_config_cap_keep, clr_config_cap_keep, }, - { "lxc.console.logfile", false, set_config_console_logfile, get_config_console_logfile, clr_config_console_logfile, }, - { "lxc.console.path", false, set_config_console_path, get_config_console_path, clr_config_console_path, }, - { "lxc.seccomp.profile", false, set_config_seccomp_profile, get_config_seccomp_profile, clr_config_seccomp_profile, }, - { "lxc.include", false, set_config_includefiles, get_config_includefiles, clr_config_includefiles, }, - { "lxc.autodev", false, set_config_autodev, get_config_autodev, clr_config_autodev, }, - - /* [START]: REMOVE IN LXC 3.0 */ { "lxc.seccomp", true, set_config_seccomp_profile, get_config_seccomp_profile, clr_config_seccomp_profile, }, { "lxc.console", true, set_config_console_path, get_config_console_path, clr_config_console_path, }, { "lxc.haltsignal", true, set_config_signal_halt, get_config_signal_halt, clr_config_signal_halt, }, { "lxc.rebootsignal", true, set_config_signal_reboot, get_config_signal_reboot, clr_config_signal_reboot, }, { "lxc.stopsignal", true, set_config_signal_stop, get_config_signal_stop, clr_config_signal_stop, }, - /* [END]: REMOVE IN LXC 3.0 */ - - { "lxc.signal.halt", false, set_config_signal_halt, get_config_signal_halt, clr_config_signal_halt, }, - { "lxc.signal.reboot", false, set_config_signal_reboot, get_config_signal_reboot, clr_config_signal_reboot, }, - { "lxc.signal.stop", false, set_config_signal_stop, get_config_signal_stop, clr_config_signal_stop, }, - { "lxc.start.auto", false, set_config_start, get_config_start, clr_config_start, }, - { "lxc.start.delay", false, set_config_start, get_config_start, clr_config_start, }, - { "lxc.start.order", false, set_config_start, get_config_start, clr_config_start, }, - { "lxc.monitor.unshare", false, set_config_monitor, get_config_monitor, clr_config_monitor, }, - { "lxc.group", false, set_config_group, get_config_group, clr_config_group, }, - { "lxc.environment", false, set_config_environment, get_config_environment, clr_config_environment, }, - { "lxc.ephemeral", false, set_config_ephemeral, get_config_ephemeral, clr_config_ephemeral, }, - { "lxc.no_new_privs", false, set_config_no_new_privs, get_config_no_new_privs, clr_config_no_new_privs, }, - - /* [START]: REMOVE IN LXC 3.0 */ { "lxc.syslog", true, set_config_log_syslog, get_config_log_syslog, clr_config_log_syslog, }, { "lxc.loglevel", true, set_config_log_level, get_config_log_level, clr_config_log_level, }, { "lxc.logfile", true, set_config_log_file, get_config_log_file, clr_config_log_file, }, @@ -260,14 +247,6 @@ static struct lxc_config_t config[] = { { "lxc.init_gid", true, set_config_init_gid, get_config_init_gid, clr_config_init_gid, }, { "lxc.limit", true, set_config_limit, get_config_limit, clr_config_limit, }, /* [END]: REMOVE IN LXC 3.0 */ - - { "lxc.log.syslog", false, set_config_log_syslog, get_config_log_syslog, clr_config_log_syslog, }, - { "lxc.log.level", false, set_config_log_level, get_config_log_level, clr_config_log_level, }, - { "lxc.log.file", false, set_config_log_file, get_config_log_file, clr_config_log_file, }, - { "lxc.init.cmd", false, set_config_init_cmd, get_config_init_cmd, clr_config_init_cmd, }, - { "lxc.init.uid", false, set_config_init_uid, get_config_init_uid, clr_config_init_uid, }, - { "lxc.init.gid", false, set_config_init_gid, get_config_init_gid, clr_config_init_gid, }, - { "lxc.prlimit", false, set_config_prlimit, get_config_prlimit, clr_config_prlimit, }, }; struct signame {
_______________________________________________ lxc-devel mailing list [email protected] http://lists.linuxcontainers.org/listinfo/lxc-devel
