Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backports (5.21-candidate) #401

Merged
merged 3 commits into from
Mar 22, 2024
Merged

Backports (5.21-candidate) #401

merged 3 commits into from
Mar 22, 2024

Commits on Mar 22, 2024

  1. snapcraft: lxcfs: cherry-pick upstream bugfix 

    Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
(cherry picked from commit ecae4c5)
    @mihalicyn @simondeziel
    mihalicyn authored and simondeziel committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    98d9d60 View commit details
    Browse the repository at this point in the history

  2. snapcraft/commands/daemon.start: sync user/group creation with daemon… 

    ….activate

Since `groupadd`/`useradd` are called with `nsenter -t 1 -m`, their
corresponding `grep ... /etc/nsswitch.conf` check needs to look at the hostfs
file, not the `/etc/nsswitch.conf` from the base snap.

Presumably, daemon.activate ran before daemon.start, thus avoid any real world
issue.

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
(cherry picked from commit 7c43a70)
    @simondeziel
    simondeziel committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    35ab41d View commit details
    Browse the repository at this point in the history

  3. snapcraft: don't shallow clone lxcfs to work with cherry-picks 

    Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
(cherry picked from commit dcfc1b1)
    @simondeziel
    simondeziel committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    891755b View commit details
    Browse the repository at this point in the history