Code Review
/
packages
/
trusty
/
mcollective.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
mcollective repackaged for 7.0
[packages/trusty/mcollective.git]
/
bin
/
mcollectived
diff --git
a/bin/mcollectived
b/bin/mcollectived
index 4f0d1d8f056ccb7cc7667e751308ed3c1402a9d2..186387753351d01b509186550fd60febfb403d15 100755
(executable)
--- a/
bin/mcollectived
+++ b/
bin/mcollectived
@@
-9,7
+9,11
@@
opts = GetoptLong.new(
[ '--pidfile', '-p', GetoptLong::REQUIRED_ARGUMENT]
)
[ '--pidfile', '-p', GetoptLong::REQUIRED_ARGUMENT]
)
-configfile = "/etc/mcollective/server.cfg"
+if MCollective::Util.windows?
+ configfile = File.join(MCollective::Util.windows_prefix, "etc", "server.cfg")
+else
+ configfile = "/etc/mcollective/server.cfg"
+end
pid = ""
opts.each do |opt, arg|
pid = ""
opts.each do |opt, arg|