nixos/waagent: move runtime dependencies to systemd service

The udev rules shell out to chmod, cut and readlink, which are available
for udev rules (see https://github.com/NixOS/nixpkgs/pull/274236).
This commit is contained in:
Florian Klink 2023-12-14 14:49:49 +02:00
parent f9991e9de0
commit 276939e0a1
2 changed files with 25 additions and 33 deletions

View File

@ -245,6 +245,27 @@ in
pkgs.e2fsprogs
pkgs.bash
pkgs.findutils
pkgs.gnugrep
pkgs.gnused
pkgs.iproute2
pkgs.iptables
# for hostname
pkgs.nettools
pkgs.openssh
pkgs.openssl
pkgs.parted
# for pidof
pkgs.procps
# for useradd, usermod
pkgs.shadow
pkgs.util-linux # for (u)mount, fdisk, sfdisk, mkswap
# waagent's Microsoft.OSTCExtensions.VMAccessForLinux needs Python 3
pkgs.python39

View File

@ -1,18 +1,9 @@
{ fetchFromGitHub
, findutils
, gnugrep
, gnused
, iproute2
, iptables
{ bash
, coreutils
, fetchFromGitHub
, lib
, nettools
, openssh
, openssl
, parted
, procps
, python39
, shadow
, util-linux
, substituteAll
}:
let
@ -47,26 +38,6 @@ python.pkgs.buildPythonApplication rec {
propagatedBuildInputs = [ python.pkgs.distro ];
makeWrapperArgs = [
"--prefix"
"PATH"
":"
(lib.makeBinPath [
findutils
gnugrep
gnused
iproute2
iptables
nettools # for hostname
openssh
openssl
parted
procps # for pidof
shadow # for useradd, usermod
util-linux # for (u)mount, fdisk, sfdisk, mkswap
])
];
# The binary entrypoint and udev rules are placed to the wrong place.
# Move them to their default location.
preFixup = ''