mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-07 11:05:30 +03:00
Merge master into staging-next
This commit is contained in:
commit
fa94414f70
61 changed files with 349 additions and 506 deletions
|
@ -142,6 +142,7 @@ in
|
|||
# convert remainings logs and start eventually
|
||||
atop.serviceConfig.ExecStartPre = pkgs.writeShellScript "atop-update-log-format" ''
|
||||
set -e -u
|
||||
shopt -s nullglob
|
||||
for logfile in "$LOGPATH"/atop_*
|
||||
do
|
||||
${atop}/bin/atopconvert "$logfile" "$logfile".new
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue