movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix initrd after recent busybox upgrades

Browse source
This commit is contained in:
Luca Bruno 2014-09-05 18:42:14 +02:00
parent 7f5bc10186
commit 718106e958
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/system/boot/stage-1.nix
View file

@ -50,7 +50,7 @@ let
cp -pvd ${pkgs.busybox}/bin/* ${pkgs.busybox}/sbin/* $out/bin/ cp -pvd ${pkgs.busybox}/bin/* ${pkgs.busybox}/sbin/* $out/bin/
# Copy some utillinux stuff. # Copy some utillinux stuff.
cp -vf ${pkgs.utillinux}/sbin/blkid $out/bin cp -vf --remove-destination ${pkgs.utillinux}/sbin/blkid $out/bin
cp -pdv ${pkgs.utillinux}/lib/libblkid*.so.* $out/lib cp -pdv ${pkgs.utillinux}/lib/libblkid*.so.* $out/lib
cp -pdv ${pkgs.utillinux}/lib/libuuid*.so.* $out/lib cp -pdv ${pkgs.utillinux}/lib/libuuid*.so.* $out/lib

2
nixos/modules/virtualisation/qemu-vm.nix
View file

@ -278,7 +278,7 @@ in
boot.initrd.extraUtilsCommands = boot.initrd.extraUtilsCommands =
'' ''
# We need mke2fs in the initrd. # We need mke2fs in the initrd.
cp -f ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin cp -vf --remove-destination ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin
''; '';
boot.initrd.postDeviceCommands = boot.initrd.postDeviceCommands =