Commit 1827d03e authored by Mike Hibler's avatar Mike Hibler

Revert last '--' arg fix, it is incompatible with existing hacks for this.

Too many to change. Instead make the hack to watchdog as well.
parent 939ba7b8
......@@ -406,7 +406,7 @@ sub runtmcc ($;$$%)
if (!defined($args)) {
$args = "";
}
my $string = "$TMCCBIN $options -- $cmd $args";
my $string = "$TMCCBIN $options $cmd $args";
if ($debug) {
print STDERR "$string\n";
}
......
#!/usr/bin/perl -w
#
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# Copyright (c) 2000-2013 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -718,7 +718,7 @@ sub ntpdrift($)
logmsg("ntpdrift: updating NTP drift from $lastdrift to $drift\n");
# Server also checks the value for sanity.
tmcc(TMCCCMD_NTPDRIFT, $1, undef, ("timeout" => 3));
tmcc(TMCCCMD_NTPDRIFT, "-- $1", undef, ("timeout" => 3));
$lastdrift = $drift;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment