From 358470763822d490fb36f8e5e3eca6f1e4c8378f Mon Sep 17 00:00:00 2001 From: Christian Albrecht Date: Sun, 25 Jun 2017 16:03:30 +0200 Subject: nixos/boot/stage-1: fix failing nixos-rebuild switch because of blkid output old version of blkid used to output version information including libblkid version when invoked with --help parameter new version does not output libblkid version when invoked with --help parameter fix is to invoke blkid with -V parameter to output version including libblkid in both cases --- nixos/modules/system/boot/stage-1.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/system/boot/stage-1.nix') diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 73608a0e27f2..02870878c0f3 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -135,7 +135,7 @@ let $out/bin/ash -c 'echo hello world' | grep "hello world" export LD_LIBRARY_PATH=$out/lib $out/bin/mount --help 2>&1 | grep -q "BusyBox" - $out/bin/blkid --help 2>&1 | grep -q 'libblkid' + $out/bin/blkid -V 2>&1 | grep -q 'libblkid' $out/bin/udevadm --version $out/bin/dmsetup --version 2>&1 | tee -a log | grep -q "version:" LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a log | grep -q "LVM" -- cgit 1.4.1