[lxc/lxc] d06abe: file_utils: add same_device() helper

[Stéphane Graber]

Branch: refs/heads/master
Home: https://github.com/lxc/lxc
Commit: d06abe2f9c47c2a355b3ea1a5194abe3fa8d7cb5
https://github.com/lxc/lxc/commit/d06abe2f9c47c2a355b3ea1a5194abe3fa8d7cb5
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-08-17 (Tue, 17 Aug 2021)

Changed paths:
M src/lxc/file_utils.c
M src/lxc/file_utils.h

Log Message:
-----------
file_utils: add same_device() helper

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: 803839b8b978b29034ba7fe0ca5abe3d60dd8130
https://github.com/lxc/lxc/commit/803839b8b978b29034ba7fe0ca5abe3d60dd8130
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-08-17 (Tue, 17 Aug 2021)

Changed paths:
M src/lxc/syscall_wrappers.h
M src/lxc/terminal.c

Log Message:
-----------
terminal: use /dev/ptmx when allocating pty devices from devpts instances we didn't mount ourselves

When we aren't told what devpts instance to allocate from we assume it
is the one in the caller's mount namespace.
This poses a slight complication, a lot of distros will change
permissions on /dev/ptmx so it can be opened by unprivileged users but
will not change permissions on /dev/pts/ptmx itself. In addition,
/dev/ptmx can either be a symlink, a bind-mount, or a separate device
node. So we need to allow for fairly lax lookup.

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: 8829829debe9456f4207c60a15fc85e7c44bd575
https://github.com/lxc/lxc/commit/8829829debe9456f4207c60a15fc85e7c44bd575
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-08-17 (Tue, 17 Aug 2021)

Changed paths:
M templates/lxc-busybox.in

Log Message:
-----------
busybox: mount sys:ro

There's no udev so sys doesn't need to be read-write.

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: b081cb55e4e76330e80db2155be5dafc8b147fc5
https://github.com/lxc/lxc/commit/b081cb55e4e76330e80db2155be5dafc8b147fc5
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-08-17 (Tue, 17 Aug 2021)

Changed paths:
M templates/lxc-busybox.in

Log Message:
-----------
busybox: simplify

Start relying on autodev for busybox template and wipe all the device
creation.

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: 03585adc0eec4d4bf4ced638102f1f8b46bbf54c
https://github.com/lxc/lxc/commit/03585adc0eec4d4bf4ced638102f1f8b46bbf54c
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-08-17 (Tue, 17 Aug 2021)

Changed paths:
M src/lxc/conf.c

Log Message:
-----------
conf: allow for tty allocation even when container did not request separate devpts instance

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: fd0349a7a0fe6283f13d72d5587799089986b1e3
https://github.com/lxc/lxc/commit/fd0349a7a0fe6283f13d72d5587799089986b1e3
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-08-17 (Tue, 17 Aug 2021)

Changed paths:
M src/tests/sys_mixed.c

Log Message:
-----------
tests: fix order in sys_mixed

We need to set the config item after we loaded the config obviously.

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: acd792c965b23753cb31336f153fec196a88c531
https://github.com/lxc/lxc/commit/acd792c965b23753cb31336f153fec196a88c531
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-08-17 (Tue, 17 Aug 2021)

Changed paths:
M src/tests/lxc-test-apparmor-generated

Log Message:
-----------
test: use busybox in lxc-test-apparmor-generated

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: adb14537d2d3e0e3bd0bc8b4cc4daac208811819
https://github.com/lxc/lxc/commit/adb14537d2d3e0e3bd0bc8b4cc4daac208811819
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-08-17 (Tue, 17 Aug 2021)

Changed paths:
M src/tests/lxc-test-apparmor-mount

Log Message:
-----------
test: use busybox in lxc-test-apparmor-mount

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: bc849355520d0a38bd8af6aea6c5f9d6889e85b4
https://github.com/lxc/lxc/commit/bc849355520d0a38bd8af6aea6c5f9d6889e85b4
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-08-17 (Tue, 17 Aug 2021)

Changed paths:
M src/tests/lxc-test-autostart

Log Message:
-----------
test: use busybox in lxc-test-autostart

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: f6a53ad2c593ade2320cc357abd15e01e22b6f8d
https://github.com/lxc/lxc/commit/f6a53ad2c593ade2320cc357abd15e01e22b6f8d
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-08-17 (Tue, 17 Aug 2021)

Changed paths:
M src/tests/lxc-test-no-new-privs

Log Message:
-----------
tests: use busybox in lxc-test-no-new-privs

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: 6c321ceada044345cf9cb66890118d3138923538
https://github.com/lxc/lxc/commit/6c321ceada044345cf9cb66890118d3138923538
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-08-17 (Tue, 17 Aug 2021)

Changed paths:
M src/tests/lxc-test-unpriv

Log Message:
-----------
tests: use busybox in lxc-test-unpriv

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: 41ed9db898e15bcdd3d29c457cf7b8f5e98abd91
https://github.com/lxc/lxc/commit/41ed9db898e15bcdd3d29c457cf7b8f5e98abd91
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-08-17 (Tue, 17 Aug 2021)

Changed paths:
M src/tests/lxc-test-usernic.in

Log Message:
-----------
tests: use busybox in lxc-test-usernic.in

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: ba4339b677247ca40c00502662ebe1f490f38759
https://github.com/lxc/lxc/commit/ba4339b677247ca40c00502662ebe1f490f38759
Author: Stéphane Graber <stgr...@ubuntu.com>
Date: 2021-08-17 (Tue, 17 Aug 2021)

Changed paths:
M src/lxc/conf.c
M src/lxc/file_utils.c
M src/lxc/file_utils.h
M src/lxc/syscall_wrappers.h
M src/lxc/terminal.c
M src/tests/lxc-test-apparmor-generated
M src/tests/lxc-test-apparmor-mount
M src/tests/lxc-test-autostart
M src/tests/lxc-test-no-new-privs
M src/tests/lxc-test-unpriv
M src/tests/lxc-test-usernic.in
M src/tests/sys_mixed.c
M templates/lxc-busybox.in

Log Message:
-----------
Merge pull request #3940 from brauner/2021-08-16.fixes.2

tests: only rely on busybox template getting rid of all network dependencies; terminal: allow for tty allocation even when container did not request separate devpts instance


Compare: https://github.com/lxc/lxc/compare/72c6d3a56d6f...ba4339b67724