Blame ocsinventory-agent-options.patch
|
 |
c165f54 |
--- ocsinventory-agent.orig 2008-04-02 20:27:42.000000000 +0200
|
|
|
c165f54 |
+++ ocsinventory-agent 2008-04-02 20:29:12.000000000 +0200
|
|
|
c165f54 |
@@ -86,7 +86,7 @@
|
|
|
c165f54 |
"p|password=s" => \$params->{password},
|
|
|
c165f54 |
"r|realm=s" => \$params->{realm},
|
|
|
c165f54 |
"R|remotedir=s" => \$params->{remotedir},
|
|
|
c165f54 |
- "s|server=s" => \$params->{server},
|
|
|
c165f54 |
+ "s|server=s" => \$params->{optserver},
|
|
|
c165f54 |
"stdout" => \$params->{stdout},
|
|
|
c165f54 |
"t|tag=s" => \$params->{tag},
|
|
|
c165f54 |
"u|user=s" => \$params->{user},
|
|
|
c165f54 |
@@ -215,6 +215,13 @@
|
|
|
c165f54 |
$params->{nosoftware} = 1
|
|
|
c165f54 |
}
|
|
|
c165f54 |
|
|
|
c165f54 |
+# allow "server" from command line when "local" in config. file
|
|
|
c165f54 |
+if (defined($params->{optserver})) {
|
|
|
c165f54 |
+ $params->{server}=$params->{optserver};
|
|
|
c165f54 |
+ undef $params->{local};
|
|
|
c165f54 |
+ undef $params->{optserver};
|
|
|
c165f54 |
+}
|
|
|
c165f54 |
+
|
|
|
c165f54 |
if ($params->{server} !~ /^http(|s):\/\//) {
|
|
|
c165f54 |
$logger->debug("the --server passed doesn't have a protocle, assume http as default");
|
|
|
c165f54 |
$params->{server} = "http://".$params->{server}
|