diff options
| author | Paul Schyska <paul@schyska.net> | 2021-05-16 22:07:24 +0200 |
|---|---|---|
| committer | Paul Schyska <paul@schyska.net> | 2021-05-16 22:07:24 +0200 |
| commit | 27d323d2813bf44473cb7a4f2d5e0f4acc84c5ff (patch) | |
| tree | 8928fad54bc0f802f714dc8ba33b1e1d0d77ef09 /pkgs/os-specific/linux/netatop | |
| parent | 563ba07543cb900eee5681a65259dd6c3533248b (diff) | |
| download | nixpkgs-27d323d2813bf44473cb7a4f2d5e0f4acc84c5ff.tar nixpkgs-27d323d2813bf44473cb7a4f2d5e0f4acc84c5ff.tar.gz nixpkgs-27d323d2813bf44473cb7a4f2d5e0f4acc84c5ff.tar.bz2 nixpkgs-27d323d2813bf44473cb7a4f2d5e0f4acc84c5ff.tar.lz nixpkgs-27d323d2813bf44473cb7a4f2d5e0f4acc84c5ff.tar.xz nixpkgs-27d323d2813bf44473cb7a4f2d5e0f4acc84c5ff.tar.zst nixpkgs-27d323d2813bf44473cb7a4f2d5e0f4acc84c5ff.zip | |
netatop: Split out path fixing and PIDFile changes to separate patches and comment
Diffstat (limited to 'pkgs/os-specific/linux/netatop')
| -rw-r--r-- | pkgs/os-specific/linux/netatop/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/netatop/fix-paths.patch | 11 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/netatop/netatop.service.patch | 11 |
3 files changed, 19 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 242fcbf681e..28f989929a4 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -16,7 +16,12 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; - patches = [ ./netatop.service.patch ]; + patches = [ + # fix paths in netatop.service + ./fix-paths.patch + # Specify PIDFile in /run, not /var/run to silence systemd warning + ./netatop.service.patch + ]; preConfigure = '' patchShebangs mkversion sed -i -e 's,^KERNDIR.*,KERNDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build,' \ diff --git a/pkgs/os-specific/linux/netatop/fix-paths.patch b/pkgs/os-specific/linux/netatop/fix-paths.patch new file mode 100644 index 00000000000..0e71c4efdd3 --- /dev/null +++ b/pkgs/os-specific/linux/netatop/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/netatop.service ++++ b/netatop.service +@@ -8,5 +8,5 @@ + Type=oneshot +-ExecStartPre=/sbin/modprobe netatop +-ExecStart=/usr/sbin/netatopd +-ExecStopPost=/sbin/rmmod netatop ++ExecStartPre=@kmod@/bin/modprobe netatop ++ExecStart=@out@/bin/netatopd ++ExecStopPost=@kmod@/bin/rmmod netatop + PIDFile=/var/run/netatop.pid diff --git a/pkgs/os-specific/linux/netatop/netatop.service.patch b/pkgs/os-specific/linux/netatop/netatop.service.patch index b7fae336be9..c7c798ee06b 100644 --- a/pkgs/os-specific/linux/netatop/netatop.service.patch +++ b/pkgs/os-specific/linux/netatop/netatop.service.patch @@ -1,14 +1,7 @@ --- a/netatop.service +++ b/netatop.service -@@ -7,8 +7,8 @@ - [Service] - Type=oneshot --ExecStartPre=/sbin/modprobe netatop --ExecStart=/usr/sbin/netatopd --ExecStopPost=/sbin/rmmod netatop +@@ -11,3 +11,3 @@ + ExecStopPost=@kmod@/bin/rmmod netatop -PIDFile=/var/run/netatop.pid -+ExecStartPre=@kmod@/bin/modprobe netatop -+ExecStart=@out@/bin/netatopd -+ExecStopPost=@kmod@/bin/rmmod netatop +PIDFile=/run/netatop.pid RemainAfterExit=yes |