Unverified Commit fba845e3 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #277235 from adamcstephens/lxd-agent/path 

nixos/lxd-agent: add system path for exec
parents b908e175 3f8b1d2d

nixos/modules/virtualisation/lxd-agent.nix

+7 −1
Original line number Diff line number Diff line
@@ -60,7 +60,13 @@ in { 
      wantedBy = [ "multi-user.target" ];

      before = [ "shutdown.target" ];

      conflicts = [ "shutdown.target" ];

      path = [ pkgs.kmod pkgs.util-linux ];

      path = [

        pkgs.kmod

        pkgs.util-linux



        # allow `incus exec` to find system binaries

        "/run/current-system/sw"

      ];



      preStart = preStartScript;

nixos/tests/incus/virtual-machine.nix

+3 −0
Original line number Diff line number Diff line
@@ -53,5 +53,8 @@ in 


    with subtest("lxd-agent is started"):

        machine.succeed("incus exec ${instance-name} systemctl is-active lxd-agent")



    with subtest("lxd-agent has a valid path"):

        machine.succeed("incus exec ${instance-name} -- bash -c 'true'")

  '';

})