From 3ebc7727f7115c0777d4c17ccb13a34fa8ff0228 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 28 Dec 2011 22:37:38 +0000 Subject: [PATCH] Revert "test we have cryptsetup-1.4.1 in initrd" This reverts commit 025f8c40b40fad50086e8761eee61098d8fb2651. The check was intened for building the initrd of the installer. svn path=/nixos/trunk/; revision=31137 --- modules/system/boot/luksroot.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix index f89de818f277..3781e6b13b96 100644 --- a/modules/system/boot/luksroot.nix +++ b/modules/system/boot/luksroot.nix @@ -38,19 +38,8 @@ in done ''; - # test whether cryptsetup finds all dependencies and is at least - # version 1.4.1 boot.initrd.extraUtilsCommandsTest = '' - cryptsetup_version=$($out/bin/cryptsetup --version |cut -d' ' -f2) - if test $(echo $version |cut -d'.' -f1) -lt 1; then - if test $(echo $version |cut -d'.' -f2) -lt 4; then - if test $(echo $version |cut -d'.' -f3) -lt 2; then - echo "Somehow the version of cryptsetup is too old: $cryptsetup_version instead of 1.4.1" - exit 1 - fi - fi - fi - unset cryptsetup_version + $out/bin/cryptsetup --version ''; boot.initrd.preLVMCommands = ''