From 9281a12532165054e208072e53d1b07501fe7526 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sat, 8 Jun 2024 17:57:17 +0200
Subject: tests/nixos/nix-copy: fix NixOS >= 24.05 compatibility

4b128008c5d9fde881ce1b0a25e60ae0415a14d5 in nixpkgs introduced a default
hashedPasswordFile for root in NixOS tests, which takes precedence over
the password option set in the nix-copy test.

Change-Id: Iffaebec5992e50614b854033f0d14312c8d275b5
---
 tests/nixos/nix-copy.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests/nixos')

diff --git a/tests/nixos/nix-copy.nix b/tests/nixos/nix-copy.nix
index 3bcc7a988..44aa0b7da 100644
--- a/tests/nixos/nix-copy.nix
+++ b/tests/nixos/nix-copy.nix
@@ -37,7 +37,8 @@ in {
         { config, pkgs, ... }:
         { services.openssh.enable = true;
           services.openssh.settings.PermitRootLogin = "yes";
-					users.users.root.password = "foobar";
+          users.users.root.hashedPasswordFile = lib.mkForce null;
+          users.users.root.password = "foobar";
           virtualisation.writableStore = true;
           virtualisation.additionalPaths = [ pkgB pkgC ];
         };
-- 
cgit v1.2.3