Skip to content

Commit

Permalink
nixos/boot/stage-1: fix failing nixos-rebuild switch because of blkid…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
calbrecht authored and fpletz committed Jun 26, 2017
1 parent 639b74e commit 3584707
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion nixos/modules/system/boot/stage-1.nix
Expand Up @@ -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"
Expand Down

0 comments on commit 3584707

Please sign in to comment.