From 21b2de0a20037d3731d220c1e38e3c7ee6d3f007 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 06:02:26 +0000
Subject: [PATCH 1/2] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/b833ff01a0d694b910daca6e2ff4a3f26dee478c?narHash=sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w%2BROpMfuw%3D' (2024-09-01)
  → 'github:NixOS/nixpkgs/85f7e662eda4fa3a995556527c87b2524b691933?narHash=sha256-JwQZIGSYnRNOgDDoIgqKITrPVil%2BRMWHsZH1eE1VGN0%3D' (2024-11-07)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 72f2242..9191749 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1725194671,
-        "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
+        "lastModified": 1730958623,
+        "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
+        "rev": "85f7e662eda4fa3a995556527c87b2524b691933",
         "type": "github"
       },
       "original": {

From 6bfa3a18d4625753bf653123e1d8a3b309eeaadd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 8 Nov 2024 10:03:50 +0100
Subject: [PATCH 2/2] tests/interactive-cryptsetup: make waiting for passphrase
 more robust

---
 lib/tests.nix                    |  3 +++
 tests/luks-interactive-login.nix | 10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/tests.nix b/lib/tests.nix
index 65bfd1a..25b6a59 100644
--- a/lib/tests.nix
+++ b/lib/tests.nix
@@ -54,6 +54,7 @@ let
       , postDisko ? ""
       , testMode ? "module" # can be one of direct module cli
       , testBoot ? true # if we actually want to test booting or just create/mount
+      , enableOCR ? false
       }:
       let
         makeTest' = args:
@@ -163,6 +164,8 @@ let
       in
       makeTest' {
         name = "disko-${name}";
+        meta.timeout = 600; # 10 minutes
+        inherit enableOCR;
 
         nodes.machine = { pkgs, ... }: {
           imports = [
diff --git a/tests/luks-interactive-login.nix b/tests/luks-interactive-login.nix
index 6fae2e1..a1225d0 100644
--- a/tests/luks-interactive-login.nix
+++ b/tests/luks-interactive-login.nix
@@ -1,15 +1,17 @@
-{ pkgs ? import <nixpkgs> { }
-, diskoLib ? pkgs.callPackage ../lib { }
+{
+  pkgs ? import <nixpkgs> { },
+  diskoLib ? pkgs.callPackage ../lib { },
 }:
 diskoLib.testLib.makeDiskoTest {
   inherit pkgs;
   name = "luks-interactive-login";
   disko-config = ../example/luks-interactive-login.nix;
+  enableOCR = true;
   extraTestScript = ''
     machine.succeed("cryptsetup isLuks /dev/vda2");
   '';
   bootCommands = ''
-    machine.wait_for_console_text("vda")
-    machine.send_console("secretsecret\n")
+    machine.wait_for_text("[Pp]assphrase for")
+    machine.send_chars("secretsecret\n")
   '';
 }