pyrox.dev / nixpkgs
lol
fork atom

atop: Merge all path-fixing to a single patch, comment the remaining patches

Paul Schyska 76554bee 27d323d2

+58 -44
unified split
-13
pkgs/os-specific/linux/atop/atop-pm.sh.patch
··· 1 - --- a/atop-pm.sh 2 - +++ b/atop-pm.sh 3 - @@ -2,8 +2,8 @@ 4 - 5 - case "$1" in 6 - - pre) /usr/bin/systemctl stop atop 7 - + pre) @systemd@/bin/systemctl stop atop 8 - exit 0 9 - ;; 10 - - post) /usr/bin/systemctl start atop 11 - + post) @systemd@/bin/systemctl start atop 12 - exit 0 13 - ;;
-7
pkgs/os-specific/linux/atop/atop-rotate.service.patch
··· 1 - --- a/atop-rotate.service 2 - +++ b/atop-rotate.service 3 - @@ -4,3 +4,3 @@ 4 - [Service] 5 - Type=oneshot 6 - -ExecStart=/usr/bin/systemctl try-restart atop.service 7 - +ExecStart=@systemd@/bin/systemctl try-restart atop.service
+2 -6
pkgs/os-specific/linux/atop/atop.service.patch
··· 1 1 --- a/atop.service 2 2 +++ b/atop.service 3 - @@ -9,7 +9,8 @@ 3 + @@ -9,5 +9,6 @@ 4 4 Environment=LOGPATH=/var/log/atop 5 5 -EnvironmentFile=/etc/default/atop 6 6 +EnvironmentFile=-/etc/default/atop 7 7 ExecStartPre=/bin/sh -c 'test -n "$LOGINTERVAL" -a "$LOGINTERVAL" -eq "$LOGINTERVAL"' 8 8 ExecStartPre=/bin/sh -c 'test -n "$LOGGENERATIONS" -a "$LOGGENERATIONS" -eq "$LOGGENERATIONS"' 9 - -ExecStart=/bin/sh -c 'exec /usr/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}' 10 - -ExecStartPost=/usr/bin/find "${LOGPATH}" -name "atop_*" -mtime +${LOGGENERATIONS} -exec rm -v {} \; 11 9 +ExecStartPre=/bin/sh -c 'mkdir -p "${LOGPATH}"' 12 - +ExecStart=/bin/sh -c 'exec @out@/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}' 13 - +ExecStartPost=@findutils@/bin/find "${LOGPATH}" -name "atop_*" -mtime +${LOGGENERATIONS} -exec rm -v {} \; 14 - KillSignal=SIGUSR2 10 + ExecStart=/bin/sh -c 'exec @out@/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}'
+2 -6
pkgs/os-specific/linux/atop/atopacct.service.patch
··· 1 1 --- a/atopacct.service 2 2 +++ b/atopacct.service 3 - @@ -8,6 +8,6 @@ 4 - [Service] 3 + @@ -9,3 +9,3 @@ 5 4 Type=forking 6 5 -PIDFile=/var/run/atopacctd.pid 7 - -ExecStart=/usr/sbin/atopacctd 8 6 +PIDFile=/run/atopacctd.pid 9 - +ExecStart=@out@/bin/atopacctd 10 - 11 - [Install] 7 + ExecStart=@out@/bin/atopacctd
-9
pkgs/os-specific/linux/atop/atopgpu.service.patch
··· 1 - --- a/atopgpu.service 2 - +++ b/atopgpu.service 3 - @@ -6,5 +6,5 @@ 4 - 5 - [Service] 6 - -ExecStart=/usr/sbin/atopgpud 7 - +ExecStart=@out@/bin/atopgpud 8 - Type=oneshot 9 - RemainAfterExit=yes
+6 -3
pkgs/os-specific/linux/atop/default.nix
··· 35 35 ]; 36 36 37 37 patches = [ 38 - ./atop-pm.sh.patch 39 - ./atop-rotate.service.patch 38 + # Fix paths in atop.service, atop-rotate.service, atopgpu.service, atopacct.service, 39 + # and atop-pm.sh 40 + ./fix-paths.patch 41 + # Don't fail on missing /etc/default/atop, make sure /var/log/atop exists pre-start 40 42 ./atop.service.patch 43 + # Specify PIDFile in /run, not /var/run to silence systemd warning 41 44 ./atopacct.service.patch 42 - ] ++ (if withAtopgpu then [ ./atopgpu.service.patch ] else [ ]); 45 + ]; 43 46 44 47 preConfigure = '' 45 48 for f in *.{sh,service}; do
+48
pkgs/os-specific/linux/atop/fix-paths.patch
··· 1 + --- a/atop.service 2 + +++ b/atop.service 3 + @@ -12,4 +12,4 @@ 4 + ExecStartPre=/bin/sh -c 'test -n "$LOGGENERATIONS" -a "$LOGGENERATIONS" -eq "$LOGGENERATIONS"' 5 + -ExecStart=/bin/sh -c 'exec /usr/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}' 6 + -ExecStartPost=/usr/bin/find "${LOGPATH}" -name "atop_*" -mtime +${LOGGENERATIONS} -exec rm -v {} \; 7 + +ExecStart=/bin/sh -c 'exec @out@/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}' 8 + +ExecStartPost=@findutils@/bin/find "${LOGPATH}" -name "atop_*" -mtime +${LOGGENERATIONS} -exec rm -v {} \; 9 + KillSignal=SIGUSR2 10 + 11 + --- a/atop-rotate.service 12 + +++ b/atop-rotate.service 13 + @@ -4,3 +4,3 @@ 14 + [Service] 15 + Type=oneshot 16 + -ExecStart=/usr/bin/systemctl try-restart atop.service 17 + +ExecStart=@systemd@/bin/systemctl try-restart atop.service 18 + 19 + --- a/atopgpu.service 20 + +++ b/atopgpu.service 21 + @@ -6,5 +6,5 @@ 22 + 23 + [Service] 24 + -ExecStart=/usr/sbin/atopgpud 25 + +ExecStart=@out@/bin/atopgpud 26 + Type=oneshot 27 + RemainAfterExit=yes 28 + 29 + --- a/atopacct.service 30 + +++ b/atopacct.service 31 + @@ -10,3 +10,3 @@ 32 + PIDFile=/var/run/atopacctd.pid 33 + -ExecStart=/usr/sbin/atopacctd 34 + +ExecStart=@out@/bin/atopacctd 35 + 36 + --- a/atop-pm.sh 37 + +++ b/atop-pm.sh 38 + @@ -2,8 +2,8 @@ 39 + 40 + case "$1" in 41 + - pre) /usr/bin/systemctl stop atop 42 + + pre) @systemd@/bin/systemctl stop atop 43 + exit 0 44 + ;; 45 + - post) /usr/bin/systemctl start atop 46 + + post) @systemd@/bin/systemctl start atop 47 + exit 0 48 + ;;