Merge master into staging-next

2020-11-27 15:09:19 +01:00
parent 9778483751 be36f6f0a0
commit b2a3891e12
800 changed files with 21489 additions and 5337 deletions
@@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {

    systemd.shutdown.test = pkgs.writeScript "test.shutdown" ''
      #!${pkgs.runtimeShell}
-      PATH=${lib.makeBinPath (with pkgs; [ utillinux coreutils ])}
+      PATH=${lib.makeBinPath (with pkgs; [ util-linux coreutils ])}
      mount -t 9p shared -o trans=virtio,version=9p2000.L /tmp/shared
      touch /tmp/shared/shutdown-test
      umount /tmp/shared