From 61b8a8ffef4452cb6f6065f46631868349268d3e Mon Sep 17 00:00:00 2001 From: Björn Geiger Date: Fri, 14 Oct 2011 11:34:31 +0200 Subject: bootosCheck korrigiert --- gearman/controllerWorker/ControllerWorker/Boot.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gearman') diff --git a/gearman/controllerWorker/ControllerWorker/Boot.java b/gearman/controllerWorker/ControllerWorker/Boot.java index 17a017f..bac42e1 100755 --- a/gearman/controllerWorker/ControllerWorker/Boot.java +++ b/gearman/controllerWorker/ControllerWorker/Boot.java @@ -594,15 +594,11 @@ public class Boot extends Thread { if (!result.isEmpty()) { JSONObject resultObj = (JSONObject) JSONValue.parse(result); if (!resultObj.containsKey("err")) { - /* - * String release = resultObj.get("Release").toString(); - * String distriputorID = - * resultObj.get("Distributor ID").toString(); - */ - String description = resultObj.get("Description") - .toString(); + String clientBootOs = resultObj.get("Distributor ID") + .toString() + + " " + resultObj.get("Release").toString(); - if (description.equals(bootOS)) { + if (clientBootOs.equals(bootOS)) { logger.info(client.getIp() + " right OS"); // right os, go to successState client.setState(ClientState.BOOT_SUCCESS, -- cgit v1.2.3-55-g7522