Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 83734065f29d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a36b965ede09
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Mar 21, 2019

  1. Merge overlayfs fix, LTS kernel bump and test

    In Linux 4.19 there has been a major rework of the overlayfs
    implementation and it now opens files in lowerdir with O_NOATIME, which
    in turn caused issues in our VM tests because the process owner of QEMU
    doesn't match the file owner of the lowerdir.
    
    The crux here is that 9p propagates the O_NOATIME flag to the host and
    the guest kernel has no way of verifying whether that flag will lead to
    any problems beforehand.
    
    There is ongoing work to possibly fix this in the kernel, but it will
    take a while until there is a working patch and consensus.
    
    So in order to bring our default kernel back to 4.19 and of course make
    it possible to run newer kernels in VM tests, I'm merging a small QEMU
    patch as an interim solution, which we can drop once we have a working
    fix in the next round of stable kernels.
    
    Now we already had Linux 4.19 set as the default kernel, but that was
    subsequently reverted in 048c36c
    because the patch we have used was the revert of the commit I bisected a
    while ago.
    
    This patch broke overlayfs in other ways, so I'm also merging in a VM
    test by @bachp, which only tests whether overlayfs is working, just to
    be on the safe side that something like this won't happen in the future.
    
    Even though this change could be considered a moderate mass-rebuild at
    least for GNU/Linux, I'm merging this to master, mainly to give us some
    time to get it into the current 19.03 release branch (and subsequent
    testing window) once we got no new breaking builds from Hydra.
    
    Cc: @samueldr, @lheckemann
    
    Fixes: #54509
    Fixes: #48828
    Merges: #57641
    Merges: #54508
    (cherry picked from commit 12efcc2)
    aszlig committed Mar 21, 2019
    1
    Copy the full SHA
    a36b965 View commit details
    Browse the repository at this point in the history