Unverified Commit f8131a5a authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

Merge pull request #290288 from mkg20001/lxc-initrd-fix 

nixos/lxc-container: link to prepare-root when boot.initrd.systemd.enable is on
parents 0472f3c9 c607e70f

nixos/modules/virtualisation/lxc-container.nix

+7 −5
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ 


  options = { };



  config = {

  config = let

    initScript = if config.boot.initrd.systemd.enable then "prepare-root" else "init";

  in {

    boot.isContainer = true;

    boot.postBootCommands =

      ''
@@ -41,7 +43,7 @@ 


      contents = [

        {

          source = config.system.build.toplevel + "/init";

          source = config.system.build.toplevel + "/${initScript}";

          target = "/sbin/init";

        }

        # Technically this is not required for lxc, but having also make this configuration work with systemd-nspawn.
@@ -65,7 +67,7 @@ 


      pseudoFiles = [

        "/sbin d 0755 0 0"

        "/sbin/init s 0555 0 0 ${config.system.build.toplevel}/init"

        "/sbin/init s 0555 0 0 ${config.system.build.toplevel}/${initScript}"

        "/dev d 0755 0 0"

        "/proc d 0555 0 0"

        "/sys d 0555 0 0"
@@ -74,7 +76,7 @@ 


    system.build.installBootLoader = pkgs.writeScript "install-lxd-sbin-init.sh" ''

      #!${pkgs.runtimeShell}

      ${pkgs.coreutils}/bin/ln -fs "$1/init" /sbin/init

      ${pkgs.coreutils}/bin/ln -fs "$1/${initScript}" /sbin/init

    '';



    # networkd depends on this, but systemd module disables this for containers
@@ -83,7 +85,7 @@ 
    systemd.packages = [ pkgs.distrobuilder.generator ];



    system.activationScripts.installInitScript = lib.mkForce ''

      ln -fs $systemConfig/init /sbin/init

      ln -fs $systemConfig/${initScript} /sbin/init

    '';

  };

}

nixos/tests/incus/container.nix

+2 −2
Original line number Diff line number Diff line 
import ../make-test-python.nix ({ pkgs, lib, ... } :

import ../make-test-python.nix ({ pkgs, lib, extra ? {}, ... } :



let

  releases = import ../../release.nix {

    configuration = {

      # Building documentation makes the test unnecessarily take a longer time:

      documentation.enable = lib.mkForce false;

    };

    } // extra;

  };



  container-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system};

nixos/tests/incus/default.nix

+5 −1
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ 
  handleTestOn,

}:

{

  container = import ./container.nix { inherit system pkgs; };

  container-old-init = import ./container.nix { inherit system pkgs; };

  container-new-init = import ./container.nix { inherit system pkgs; extra = {

    # Enable new systemd init

    boot.initrd.systemd.enable = true;

  }; };

  lxd-to-incus = import ./lxd-to-incus.nix { inherit system pkgs; };

  preseed = import ./preseed.nix { inherit system pkgs; };

  socket-activated = import ./socket-activated.nix { inherit system pkgs; };