diff options
author | Paul Schyska <paul@schyska.net> | 2021-05-16 22:08:05 +0200 |
---|---|---|
committer | Paul Schyska <paul@schyska.net> | 2021-05-16 22:08:05 +0200 |
commit | 76554beed86e6935fefee25cdd8c78bf524aac4c (patch) | |
tree | 50f24fd7f6d78d88e32e5d2038fc6a8671df3663 /pkgs/os-specific/linux/atop/fix-paths.patch | |
parent | 27d323d2813bf44473cb7a4f2d5e0f4acc84c5ff (diff) | |
download | nixpkgs-76554beed86e6935fefee25cdd8c78bf524aac4c.tar nixpkgs-76554beed86e6935fefee25cdd8c78bf524aac4c.tar.gz nixpkgs-76554beed86e6935fefee25cdd8c78bf524aac4c.tar.bz2 nixpkgs-76554beed86e6935fefee25cdd8c78bf524aac4c.tar.lz nixpkgs-76554beed86e6935fefee25cdd8c78bf524aac4c.tar.xz nixpkgs-76554beed86e6935fefee25cdd8c78bf524aac4c.tar.zst nixpkgs-76554beed86e6935fefee25cdd8c78bf524aac4c.zip |
atop: Merge all path-fixing to a single patch, comment the remaining patches
Diffstat (limited to 'pkgs/os-specific/linux/atop/fix-paths.patch')
-rw-r--r-- | pkgs/os-specific/linux/atop/fix-paths.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/atop/fix-paths.patch b/pkgs/os-specific/linux/atop/fix-paths.patch new file mode 100644 index 00000000000..e6cd631d3c1 --- /dev/null +++ b/pkgs/os-specific/linux/atop/fix-paths.patch @@ -0,0 +1,48 @@ +--- a/atop.service ++++ b/atop.service +@@ -12,4 +12,4 @@ + ExecStartPre=/bin/sh -c 'test -n "$LOGGENERATIONS" -a "$LOGGENERATIONS" -eq "$LOGGENERATIONS"' +-ExecStart=/bin/sh -c 'exec /usr/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}' +-ExecStartPost=/usr/bin/find "${LOGPATH}" -name "atop_*" -mtime +${LOGGENERATIONS} -exec rm -v {} \; ++ExecStart=/bin/sh -c 'exec @out@/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}' ++ExecStartPost=@findutils@/bin/find "${LOGPATH}" -name "atop_*" -mtime +${LOGGENERATIONS} -exec rm -v {} \; + KillSignal=SIGUSR2 + +--- a/atop-rotate.service ++++ b/atop-rotate.service +@@ -4,3 +4,3 @@ + [Service] + Type=oneshot +-ExecStart=/usr/bin/systemctl try-restart atop.service ++ExecStart=@systemd@/bin/systemctl try-restart atop.service + +--- a/atopgpu.service ++++ b/atopgpu.service +@@ -6,5 +6,5 @@ + + [Service] +-ExecStart=/usr/sbin/atopgpud ++ExecStart=@out@/bin/atopgpud + Type=oneshot + RemainAfterExit=yes + +--- a/atopacct.service ++++ b/atopacct.service +@@ -10,3 +10,3 @@ + PIDFile=/var/run/atopacctd.pid +-ExecStart=/usr/sbin/atopacctd ++ExecStart=@out@/bin/atopacctd + +--- a/atop-pm.sh ++++ b/atop-pm.sh +@@ -2,8 +2,8 @@ + + case "$1" in +- pre) /usr/bin/systemctl stop atop ++ pre) @systemd@/bin/systemctl stop atop + exit 0 + ;; +- post) /usr/bin/systemctl start atop ++ post) @systemd@/bin/systemctl start atop + exit 0 + ;; |