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.

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

build-sys: Enable libsoup3 by default if installed #3091

Merged
merged 3 commits into from
Nov 10, 2023

Commits on Nov 9, 2023

  1. build-sys: Enable libsoup3 by default if installed

    In f39 we switched to libsoup3 by default; this ensures our CI
    picks that up automatically so we still have ostree-trivial-httpd.
    cgwalters committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    ce2a33e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c668a8c View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. unlock: Don't pass options again to overlayfs

    There seems to be a tricky regression here with the util-linux
    support for the new mount API, plus overlays support for it.
    
    ```
    [2023-11-09T21:05:30.633Z] Nov 09 21:05:26 qemu0 kola-runext-unlock-transient.sh[2108]: + unshare -m -- /bin/sh -c 'mount -o remount,rw /usr && echo hello from transient unlock >/usr/share/writable-usr-test'
    [2023-11-09T21:05:30.633Z] Nov 09 21:05:26 qemu0 kola-runext-unlock-transient.sh[2148]: mount: /usr: mount point not mounted or bad option.
    [2023-11-09T21:05:30.633Z] Nov 09 21:05:26 qemu0 kola-runext-unlock-transient.sh[2148]:        dmesg(1) may have more information after failed mount system call.
    ```
    
    OK this seems related to the new mount API support in util-linux and overlayfs.  From a strace:
    
    ```
    2095  open_tree(AT_FDCWD, "/usr", OPEN_TREE_CLOEXEC) = 3
    2095  mount_setattr(-1, NULL, 0, NULL, 0) = -1 EINVAL (Invalid argument)
    ...
    2095  fspick(3, "", FSPICK_NO_AUTOMOUNT|FSPICK_EMPTY_PATH) = 4
    2095  fsconfig(4, FSCONFIG_SET_FLAG, "seclabel", NULL, 0) = 0
    2095  fsconfig(4, FSCONFIG_SET_STRING, "lowerdir", "usr", 0) = -1 EINVAL (Invalid argument)
    ```
    
    I think the core problem here is it's trying to reconfigure the mount with existing options,
    but in the new mount namespace we can't see the lowerdir.
    
    Here we really really just want to remount writable.  Telling
    util-linux to not pass existing options fixes it.
    cgwalters committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    bc62fd5 View commit details
    Browse the repository at this point in the history