Oops, -r option in node_reboot already taken with as yet unused

"realmode" stuff that Mac is doing. Change to -c instead for reconfig.

tbsetup/node_reboot.in

@@ -31,7 +31,7 @@ sub usage()
 }
 # The hidden -r option runs this in "realmode", ie don't send an event, but
 # really do the work instead.
-my  $optlist = "dfe:nwrkar";
+my  $optlist = "dfe:nwrkac";
 
 #
 # Configure variables
@@ -113,7 +113,7 @@ if (defined($options{"r"})) {
 if (defined($options{"a"})) {
     $freemode = 1;
 }
-if (defined($options{"r"})) {
+if (defined($options{"c"})) {
     $reconfig = 1;
 }
 if (defined($options{"n"}) && !defined($options{"w"})) {
@@ -199,7 +199,7 @@ else {
 
     # Untaint the nodes.
     foreach my $node ( @ARGV ) {
-	if ($node =~ /^([-\@\w]+)$/) {
+	if ($node =~ /^([-\w]+)$/) {
 	    $node = $1;
 	}
 	else {

tbsetup/os_setup.in

@@ -509,7 +509,7 @@ if (!$TESTMODE) {
     # Fire off the reconfigs.
     #
     if (keys(%reconfigs)) {
-	$cmd = "$nodereboot -r " . join(" ", keys(%reconfigs));
+	$cmd = "$nodereboot -c " . join(" ", keys(%reconfigs));
 	$pids{$cmd} = ForkCmd($cmd);
     }