From 06c0abfe129ac9b7cd53d4c0ed6e89696509d588 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 6 Dec 2017 16:03:18 +0100 Subject: Update for WS17/18 (systemctl, rebootctl) --- src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java') diff --git a/src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java b/src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java index 041daaa..9f450b6 100644 --- a/src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java +++ b/src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java @@ -96,11 +96,12 @@ public class RemoteReboot extends AbstractTask int ret = -1; try { Shell shell = new SSH( client.clientip, port, "root", sshkey ); + String args = " " + minutes + " " + SSH.escape( client.machineuuid ); if ( shutdown ) { - ret = new Shell.Empty( shell ).exec( SHUTDOWN_CMD + " " + minutes ); + ret = new Shell.Empty( shell ).exec( SHUTDOWN_CMD + args ); status.clientStatus.put( client.machineuuid, minutes == 0 ? ClientStatus.SHUTDOWN : ClientStatus.SHUTDOWN_AT ); } else { - ret = new Shell.Empty( shell ).exec( REBOOT_CMD + " " + minutes ); + ret = new Shell.Empty( shell ).exec( REBOOT_CMD + args ); if ( ret == 0 ) { status.clientStatus.put( client.machineuuid, minutes == 0 ? ClientStatus.REBOOTING : ClientStatus.REBOOT_AT ); rebootingClients.add( client ); -- cgit v1.2.3-55-g7522