From c13d481b78d81ee1925fc5ecfad2d7385b965b78 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 17 Feb 2024 05:02:53 +0100 Subject: [PATCH] hybrid-mbr: cleanup test, wait for udev after paritioning --- example/hybrid-mbr.nix | 4 ++-- lib/types/gpt.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/example/hybrid-mbr.nix b/example/hybrid-mbr.nix index cf5f11f..4112005 100644 --- a/example/hybrid-mbr.nix +++ b/example/hybrid-mbr.nix @@ -1,9 +1,9 @@ -{disks ? ["/dev/sda"], ...}: { +{ disko.devices = { disk = { main = { type = "disk"; - device = builtins.elemAt disks 0; + device = "/dev/sdb"; content = { type = "gpt"; efiGptPartitionFirst = false; diff --git a/lib/types/gpt.nix b/lib/types/gpt.nix index 6dc7e7c..1b47020 100644 --- a/lib/types/gpt.nix +++ b/lib/types/gpt.nix @@ -99,6 +99,8 @@ in default = '' ${lib.optionalString (hp.config.mbrPartitionType != null) '' sfdisk --label-nested dos --part-type ${parent.device} ${(toString partition.config._index)} ${hp.config.mbrPartitionType} + udevadm trigger --subsystem-match=block + udevadm settle ''} ${lib.optionalString hp.config.mbrBootableFlag '' sfdisk --label-nested dos --activate ${parent.device} ${(toString partition.config._index)}