mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 00:08:32 +01:00
cloud-init: fix network renderer detection
This commit is contained in:
parent
8a5e9ef604
commit
d0c12f5b3f
2 changed files with 11 additions and 1 deletions
|
@ -1,11 +1,14 @@
|
|||
{ lib
|
||||
, nixosTests
|
||||
, buildPythonApplication
|
||||
, cloud-utils
|
||||
, dmidecode
|
||||
, fetchFromGitHub
|
||||
, iproute2
|
||||
, openssh
|
||||
, python3
|
||||
, shadow
|
||||
, systemd
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
|
@ -25,6 +28,13 @@ python3.pkgs.buildPythonApplication rec {
|
|||
prePatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace /lib/systemd $out/lib/systemd
|
||||
|
||||
substituteInPlace cloudinit/net/networkd.py \
|
||||
--replace "['/usr/sbin', '/bin']" "['/usr/sbin', '/bin', '${iproute2}/bin', '${systemd}/bin']"
|
||||
|
||||
substituteInPlace tests/unittests/test_net_activators.py \
|
||||
--replace "['/usr/sbin', '/bin']" \
|
||||
"['/usr/sbin', '/bin', '${iproute2}/bin', '${systemd}/bin']"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
@ -2521,7 +2521,7 @@ with pkgs;
|
|||
|
||||
clog-cli = callPackage ../development/tools/clog-cli { };
|
||||
|
||||
cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { };
|
||||
cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { inherit systemd; };
|
||||
|
||||
cloudbrute = callPackage ../tools/security/cloudbrute { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue