* extraSubservices: renamed serviceName' to
serviceType' which is more
correct. svn path=/nixos/trunk/; revision=12026
This commit is contained in:
parent
5235acb1d7
commit
a49eb4d1f9
@ -53,7 +53,7 @@ let
|
|||||||
let
|
let
|
||||||
svcFunction =
|
svcFunction =
|
||||||
if svc ? function then svc.function
|
if svc ? function then svc.function
|
||||||
else import (./noDir/.. + ("/" + svc.serviceName + ".nix"));
|
else import "${./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix";
|
||||||
config = addDefaultOptionValues res.options
|
config = addDefaultOptionValues res.options
|
||||||
(if svc ? config then svc.config else svc);
|
(if svc ? config then svc.config else svc);
|
||||||
defaults = {
|
defaults = {
|
||||||
|
Loading…
Reference in New Issue
Block a user