From d74caf133adfe4dff3b2755ca3c8d6f5721a482e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 15 Aug 2008 14:15:25 +0000 Subject: [PATCH] * Idem. svn path=/nixos/trunk/; revision=12634 --- boot/boot-stage-1.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix index 3e707f9e141..c26c8d1a096 100644 --- a/boot/boot-stage-1.nix +++ b/boot/boot-stage-1.nix @@ -50,8 +50,14 @@ rec { inherit (pkgsStatic) utillinux; inherit udev; e2fsprogs = pkgsDiet.e2fsprogs; - devicemapper = if config.boot.initrd.lvm then pkgsStatic.devicemapper else null; - lvm2 = if config.boot.initrd.lvm then pkgsStatic.lvm2 else null; + devicemapper = + if config.boot.initrd.lvm + then assert pkgs.devicemapper.enableStatic; pkgs.devicemapper + else null; + lvm2 = + if config.boot.initrd.lvm + then assert pkgs.lvm2.enableStatic; pkgs.lvm2 + else null; allowedReferences = []; # prevent accidents like glibc being included in the initrd } ''