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: e8e96e4b7290
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: caccc40ad01c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 18, 2018

  1. vmTools: Fix BusyBox runtime error in initrd

    With the recent update of BusyBox to version 1.29.0 in
    d6aa506 there is now a new dependency
    on libresolv.
    
    This now throws a runtime error when executing ash, eg. whenever we do
    something like this:
    
    nix-build -E 'with import ./. {}; vmTools.runInLinuxVM hello'
    
    The resulting error will be:
    
      .../ash: error while loading shared libraries: libresolv.so.2: cannot
               open shared object file: No such file or directory
    
    I tried to override BusyBox with enableStatic, but that still requires
    parts of glibc:
    
      Static linking against glibc, can't use --gc-sections
      Trying libraries: crypt m resolv
       Library crypt is not needed, excluding it
       Library m is needed, can't exclude it (yet)
       Library resolv is needed, can't exclude it (yet)
       Library m is needed, can't exclude it (yet)
       Library resolv is needed, can't exclude it (yet)
      Final link with: m resolv
    
    In the long term maybe switching to a more minimal C library such as
    musl would make more sense, but for now I just added libresolv.so to the
    initrd which fixes the runtime error.
    
    Signed-off-by: aszlig <aszlig@nix.build>
    Cc: @edolstra, @rbvermaa
    Signed-off-by: aszlig <aszlig@nix.build>
    aszlig committed Jul 18, 2018
    2 Configuration menu
    Copy the full SHA
    caccc40 View commit details
    Browse the repository at this point in the history