nixos/initrd: Generic library copying

2015-03-28 18:37:29 -07:00
parent b1e854d660
commit 4868649f03
17 changed files with 71 additions and 77 deletions
@@ -165,7 +165,7 @@ in
    boot.initrd.extraUtilsCommands =
      ''
        # We need swapon in the initrd.
-        cp --remove-destination ${pkgs.utillinux}/sbin/swapon $out/bin
+        copy_bin_and_libs ${pkgs.utillinux}/sbin/swapon
      '';

    # Don't put old configurations in the GRUB menu.  The user has no
@@ -346,7 +346,7 @@ in
    boot.initrd.extraUtilsCommands =
      ''
        # We need mke2fs in the initrd.
-        cp -vf --remove-destination ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin
+        copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/mke2fs
      '';

    boot.initrd.postDeviceCommands =