Unverified Commit 39b4c0d6 authored by Maciej Krüger's avatar Maciej Krüger
Browse files

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

Previously we were doing some parts like activation in the init script,
so linking to that works for non-systemd init

With boot.initrd.systemd.enable we no longer run activation in the init script,
but instead a new script named prepare-root, which is used instead.
parent eb60233f

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

    '';

  };

}