diff options
| author | Luca Bruno <luca.bruno@immobiliare.it> | 2014-09-05 18:42:14 +0200 |
|---|---|---|
| committer | Luca Bruno <luca.bruno@immobiliare.it> | 2014-09-05 18:42:53 +0200 |
| commit | 718106e958cbd872ecf3e08a451b80f68f950dae (patch) | |
| tree | 2c77ccc43f1eb2c87b21145de296450d26f372ce | |
| parent | 7f5bc1018670f2b2389b106408308af1cdb7b96d (diff) | |
| download | nixlib-718106e958cbd872ecf3e08a451b80f68f950dae.tar nixlib-718106e958cbd872ecf3e08a451b80f68f950dae.tar.gz nixlib-718106e958cbd872ecf3e08a451b80f68f950dae.tar.bz2 nixlib-718106e958cbd872ecf3e08a451b80f68f950dae.tar.lz nixlib-718106e958cbd872ecf3e08a451b80f68f950dae.tar.xz nixlib-718106e958cbd872ecf3e08a451b80f68f950dae.tar.zst nixlib-718106e958cbd872ecf3e08a451b80f68f950dae.zip | |
Fix initrd after recent busybox upgrades
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 426da778f434..6977880fa284 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -50,7 +50,7 @@ let cp -pvd ${pkgs.busybox}/bin/* ${pkgs.busybox}/sbin/* $out/bin/ # 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/libuuid*.so.* $out/lib diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 58386ce5cf56..33f48d65d43e 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -278,7 +278,7 @@ in boot.initrd.extraUtilsCommands = '' # 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 = |