Branch: refs/heads/master Home: https://github.com/lxc/lxc Commit: 52ab03ac1936f05a0e50143b7d1ba92f2722c484 https://github.com/lxc/lxc/commit/52ab03ac1936f05a0e50143b7d1ba92f2722c484 Author: Maximilian Blenk <maximilian.bl...@bmw.de> Date: 2020-02-05 (Wed, 05 Feb 2020)
Changed paths: M src/lxc/confile.c Log Message: ----------- container.conf: Fix off by 2 in option parsing This commit fixes a off by 2 in config option parsing (due to missing parenthesis). The error occurs if for instance lxc.net.0.type is parsed. In that case, the .0 is removed from the string. However, due to the missing parenthesis, the null terminating character is off by two which means the modified config option would be lxc.net.typepe instead of lxc.net.type. Signed-off-by: Maximilian Blenk <maximilian.bl...@bmw.de> Commit: 9aee23ad1b96b8fbbaf11c6f4a77655b478fcc45 https://github.com/lxc/lxc/commit/9aee23ad1b96b8fbbaf11c6f4a77655b478fcc45 Author: Maximilian Blenk <maximilian.bl...@bmw.de> Date: 2020-02-05 (Wed, 05 Feb 2020) Changed paths: M src/lxc/confile.c Log Message: ----------- container.conf: Fix option ordering in config_jump_table Currently lxc.selinux.context.keyring is placed after lxc.selinux.context in config_jump_table. This entails that if lxc.selinux.context.keyring is specified, lxc.selinux.context will be matched to that option. This commit places the lxc.selinux.context.keyring before lxc.selinux.context Signed-off-by: Maximilian Blenk <maximilian.bl...@bmw.de> Commit: 20c3318a80956d23fff8e4a756e730e0a2aed2cf https://github.com/lxc/lxc/commit/20c3318a80956d23fff8e4a756e730e0a2aed2cf Author: Maximilian Blenk <maximilian.bl...@bmw.de> Date: 2020-02-05 (Wed, 05 Feb 2020) Changed paths: M src/lxc/confile.c Log Message: ----------- container.conf: Document that order is important in config_jump_table Add a comment that documents that more specific options of a namespace have to be added above more generic options in config_jump_table. Signed-off-by: Maximilian Blenk <maximilian.bl...@bmw.de> Commit: a5ee97e6291480231a9102d87155db6142938501 https://github.com/lxc/lxc/commit/a5ee97e6291480231a9102d87155db6142938501 Author: Christian Brauner <christian.brau...@ubuntu.com> Date: 2020-02-05 (Wed, 05 Feb 2020) Changed paths: M src/lxc/confile.c Log Message: ----------- Merge pull request #3261 from blenk92/fix-parse-config container.conf: Fix parsing of config options: Compare: https://github.com/lxc/lxc/compare/a8b9febda310...a5ee97e62914 _______________________________________________ lxc-devel mailing list lxc-devel@lists.linuxcontainers.org http://lists.linuxcontainers.org/listinfo/lxc-devel