diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-04-30 21:02:43 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-04-30 21:04:51 +0200 |
| commit | c282de710381c803f09da98a18683ab775902436 (patch) | |
| tree | 0fbfcde9065c18e378e4a6bdfa04186229e5a76e /nixos | |
| parent | 4540123a0cf6f9c2a3c0526e4e003f53e84749eb (diff) | |
| download | nixlib-c282de710381c803f09da98a18683ab775902436.tar nixlib-c282de710381c803f09da98a18683ab775902436.tar.gz nixlib-c282de710381c803f09da98a18683ab775902436.tar.bz2 nixlib-c282de710381c803f09da98a18683ab775902436.tar.lz nixlib-c282de710381c803f09da98a18683ab775902436.tar.xz nixlib-c282de710381c803f09da98a18683ab775902436.tar.zst nixlib-c282de710381c803f09da98a18683ab775902436.zip | |
nixos/munin: remove duplicated /run/current-system/sw/bin path
A side effect of commit ff2117192105c4c356a6ce31514ca93da2e837ff
("Fix references to current-system/sw/sbin"). It changed "sbin" to "bin"
but didn't check for duplicates.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/monitoring/munin.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index b8c26a5c89ba..b26bcba64059 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -34,7 +34,7 @@ let cap=$(sed -nr 's/.*#%#\s+capabilities\s*=\s*(.+)/\1/p' $file) wrapProgram $file \ - --set PATH "/run/wrappers/bin:/run/current-system/sw/bin:/run/current-system/sw/bin" \ + --set PATH "/run/wrappers/bin:/run/current-system/sw/bin" \ --set MUNIN_LIBDIR "${pkgs.munin}/lib" \ --set MUNIN_PLUGSTATE "/var/run/munin" @@ -184,7 +184,7 @@ in mkdir -p /etc/munin/plugins rm -rf /etc/munin/plugins/* - PATH="/run/wrappers/bin:/run/current-system/sw/bin:/run/current-system/sw/bin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash + PATH="/run/wrappers/bin:/run/current-system/sw/bin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash ''; serviceConfig = { ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/"; |