Commit Graph

11729 Commits

Author SHA1 Message Date
Zen
faa38a1979
lxc-local: Change LXC_CONFIG to LXC_METADATA to match args and be more clear
Signed-off-by: Zen <z@pyl.onl>
2023-12-11 16:55:01 -05:00
Stéphane Graber
dc7738b592
Merge pull request #3430 from Der-Jan/master-zfs-fix
Read list until process exits
2023-12-10 22:37:39 -05:00
Stéphane Graber
3d5cc2fae1
Merge pull request #4351 from flisk/fix-untagged-vlans-on-bridges-without-default-pvids
don't try to delete vlan 0 from veth
2023-12-10 21:48:06 -05:00
Stéphane Graber
0c21d95216
Merge pull request #4169 from cole-miller/link-local
Disable IPv6 link-local addresses for bridged veth
2023-12-10 21:46:33 -05:00
Cole Miller
d65fe1b27d
Disable IPv6 link-local addresses for bridged veth
When creating a bridged veth tunnel, disable assignment of IPv6
link-local addresses on the host's end by writing 1 to
/proc/sys/net/ipv6/conf/NAME/disable_ipv6, if it exists.

Signed-off-by: Cole Miller <m@cole-miller.net>
2023-12-10 21:37:22 -05:00
flisk
8cff8fa1ae don't try to delete vlan 0 from veth
vid 0 is a special value that indicates the absence of a default pvid

Signed-off-by: flisk <self@flisk.xyz>
2023-12-10 21:24:05 +01:00
Stéphane Graber
d169725c2d
Merge pull request #4321 from lkomurcub/libarchive_tar_exclude
Add libarchive tar support for lxc download
2023-12-10 15:21:52 -05:00
Stéphane Graber
a6608b83c7
Merge pull request #4344 from gibmat/fix-ephemeral-copy
lxc_storage_prepare(): Fix ephemeral copies
2023-11-29 10:35:13 -05:00
Christian Brauner
0e932812ae
conf: fix ephemeral copies
Don't rely on rootfs->bdev_type because that may be NULL. Use storage->type
instead which can't be NULL.

Co-Developed-by: Mathias Gibbens <gibmat@debian.org>
Signed-off-by: Mathias Gibbens <gibmat@debian.org>
Reported-by: Mathias Gibbens <gibmat@debian.org>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2023-11-29 16:03:52 +01:00
Stéphane Graber
b425c782d4
Merge pull request #4370 from simondeziel/no-upstart
Remove support for upstart
2023-11-27 01:01:02 -05:00
Simon Deziel
abffab441e
config/init: Drop upstart files
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
2023-11-24 14:21:34 -05:00
Simon Deziel
79a4a3cf8e
doc: remove the warning mentionning upstart
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
2023-11-24 14:21:34 -05:00
Simon Deziel
7bf1695d0d
hooks/ubuntu-cloud-prep: remove upstart handling
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
2023-11-24 14:21:34 -05:00
Simon Deziel
fb73c18d2d
meson: Remove support for upstart
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
2023-11-24 14:21:34 -05:00
Stéphane Graber
9c1d70ef8b
Merge pull request #4357 from ElJeffe/fix-idmap-clear
reset root_nsuid_map and root_nsgid_map when idmaps is cleared
2023-10-12 01:25:13 -04:00
Jef Steelant
cc6819c69d reset root_nsuid_map and root_nsgid_map when idmaps is cleared
Signed-off-by: Jef Steelant <jef@steelant.be>
2023-10-11 13:19:01 +00:00
Stéphane Graber
d39c6726d6
Merge pull request #4352 from simondeziel/shellcheck-checkconfig
Make `lxc-checkconfig` shellcheck clean
2023-10-07 04:06:36 -04:00
Simon Deziel
a87d6fcc92
lxc/checkconfig: use multiline echo
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
2023-10-06 01:43:17 -04:00
Simon Deziel
f3e01fa80c
lxc/checkconfig: replace echo -n by printf
printf is already used for color output.

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
2023-10-06 01:43:17 -04:00
Simon Deziel
ba4f810bca
lxc/checkconfig: minor cosmetic change
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
2023-10-06 01:43:17 -04:00
Simon Deziel
d52c345c82
lxc/checkconfig: avoid subshell (SC2235)
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
2023-10-06 01:43:17 -04:00
Simon Deziel
f84f03d1d0
lxc/checkconfig: remove superfluous (..) around test command (SC2234)
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
2023-10-06 01:43:17 -04:00
Simon Deziel
74b9faa649
lxc/checkconfig: check exit code directly (SC2181)
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
2023-10-06 01:43:17 -04:00
Simon Deziel
5cc69e4403
lxc/checkconfig: replace ! -z by -n (SC2236)
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
2023-10-06 01:43:17 -04:00
Simon Deziel
a4684eb11b
lxc/checkconfig: add missing quotes to please shellcheck
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
2023-10-06 01:43:17 -04:00
Simon Deziel
8a611c0b28
lxc/checkconfig: remove some unneeded echo -n
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
2023-10-06 01:43:17 -04:00
Simon Deziel
cb2574319b
lxc/checkconfig: replace type by command
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
2023-10-06 01:43:17 -04:00
Simon Deziel
003efe6db9
lxc/checkconfig: replace cat | grep with grep
Also speedup `grep` invokations while at it.

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
2023-10-06 01:43:04 -04:00
Stéphane Graber
faecf3f3fe
Merge pull request #4349 from mihalicyn/set_timeout_fixup
lxc/lxccontainer: fix do_lxcapi_set_timeout retval
2023-09-26 14:33:20 -04:00
Alexander Mikhalitsyn
adadfa372e
lxc/lxccontainer: fix do_lxcapi_set_timeout retval
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
2023-09-26 19:11:52 +02:00
zhongtao
c02367e59c containers in the FREEZING state also need to be unfreeze
Signed-off-by: zhongtao <zhongtao17@huawei.com>
2023-09-14 11:35:04 +08:00
Christian Brauner
f2853a955a
Merge pull request #4345 from lxc/dependabot/github_actions/actions/checkout-4
build(deps): bump actions/checkout from 3 to 4
2023-09-04 17:04:34 +02:00
dependabot[bot]
aca53bcf70
build(deps): bump actions/checkout from 3 to 4
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-04 13:53:54 +00:00
Christian Brauner
71fa2a5e41
Merge pull request #4343 from stgraber/main
lxccontainer.h: Move new fields to the end
2023-08-31 08:25:23 +02:00
Stéphane Graber
84169158f4
lxccontainer.h: Move new fields to the end
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
2023-08-31 00:46:14 -04:00
Christian Brauner
4a386fee34
Merge pull request #4341 from stgraber/main
Remove references to LXD
2023-08-30 23:25:40 +02:00
Stéphane Graber
e2696df93b
Remove references to LXD
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
2023-08-30 17:07:27 -04:00
Christian Brauner
719c0ed12c
Merge pull request #4339 from hallyn/2023-08-29/consoleperms
Update console perms to 0600
2023-08-30 00:18:57 +02:00
Serge Hallyn
7cec54455a Update console perms to 0600
Closes #4338

We should not give execute permissions to console output.

Signed-off-by: Serge Hallyn <serge@hallyn.com>
2023-08-29 16:14:28 -05:00
Serge Hallyn
cc3cd84233
Merge pull request #4336 from smoser/fix/api-start-split-better
Fix start api call to split quoted strings in execute or init command.
2023-08-23 10:11:00 -05:00
Scott Moser
3f45443fd0 Fix start api call to split quoted strings in execute or init command.
If a user of the container.start api call provided NULL for the argv
argument, then lxc would load either 'lxc.execute.cmd' or
'lxc.init.cmd' configuration items as the command.

Given a config like:

    lxc.execute.cmd = /usr/bin/touch "file one" "file 2"

lxc would just split the string on spaces and end up executing array:

  ['touch', 'file"', 'one"', '"file', '2"']

This differs from the experience with the `lxc-start` command which
would use lxc_string_split_quoted and execute:

  ['touch', 'file one', 'file 2']

Note that as described in lxc_string_split_quoted, commands that include
nested quotes and possibly other characters are still a problem.  In
those cases, the caller of 'start' can provide an argv array.

Signed-off-by: Scott Moser <smoser@brickies.net>
2023-08-22 16:50:45 -04:00
Christian Brauner
2ec7dd38b8
Merge pull request #4260 from mihalicyn/lxcapi_set_timeout
LXC API extension: set_timeout
2023-08-22 15:22:29 +02:00
Stéphane Graber
c1d73028e8
Merge pull request #4295 from mihalicyn/apparmor_mount_propagation
Apparmor mount propagation
2023-08-17 12:31:16 -04:00
Stéphane Graber
fbc31691ee
github: Update for main branch
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
2023-07-24 11:38:07 -04:00
Christian Brauner
5a82a3f90e
Merge pull request #4327 from hallyn/2023-07-17/ai
CONTRIBUTING: add a note on AI generated code
2023-07-17 19:04:37 +02:00
Serge Hallyn
69e51b919e CONTRIBUTING: add a note on AI generated code
Signed-off-by: Serge Hallyn <shallyn@cisco.com>
2023-07-17 07:57:17 -05:00
Christian Brauner
43a0751ecd
Merge pull request #4324 from hallyn/2023-07-06/bequiet
get_hierarchy: dont WARN about no usable controller
2023-07-07 12:48:59 +02:00
Serge Hallyn
84cfe97724 get_hierarchy: dont WARN about no usable controller
If I start a container with loglevel WARN, and (on a pretty
stock ubuntu) do lxc-info -n $c, I get

lxc-start media 20230706233337.765 WARN     cgfsng - cgroups/cgfsng.c:get_hierarchy:142 - There is no useable cpuacct controller
lxc-start media 20230706233337.765 WARN     cgfsng - cgroups/cgfsng.c:get_hierarchy:142 - There is no useable blkio controller

I don't think that's worth WARNing about, so change it to
INFO.

Signed-off-by: Serge Hallyn <shallyn@cisco.com>
2023-07-06 18:34:59 -05:00
Levent Komurcu
64167f9064 Add libarchive tar support for lxc download
This patch fixes unpacking images when the system provided tar is libarchive (bsd-tar). bsd-tar  doesn't support 'exclude' flags (--anchored) like gnu-tar does. Instead each exclude path is prepended with ^ to simulate behavior of --anchored when bsd tar is detected.

Signed-off-by: Levent Komurcu <levent.komurcu@nl.bosch.com>
2023-06-26 09:23:30 +02:00
Stéphane Graber
213e2f68d9
github: Add DCO/target tests
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2023-06-21 21:45:27 -04:00