From c1acb8a5b5be1e5be5f9a6b32a2a15c50ba77cc3 Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 7 Jul 2008 09:29:30 +0000 Subject: [PATCH] Disabled memcheck and sysinfo for now git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11543 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../goto/admin/ogroups/goto/class_termgroup.inc | 6 ++++-- .../goto/admin/systems/goto/class_terminalGeneric.inc | 10 ++++++---- .../admin/systems/goto/class_workstationGeneric.inc | 10 ++++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc b/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc index e84b55aab..1171a885d 100644 --- a/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc +++ b/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc @@ -21,8 +21,10 @@ class termgroup extends plugin "reinstall" => "reinstall", "rescan" => "rescan", "wake" => "wakeup", - "memcheck" => "memcheck", - "sysinfo" => "sysinfo"); + # These are currently not supported by the tftp daemon + # "memcheck" => "memcheck", + # "sysinfo" => "sysinfo" + ); var $attributes = array("gotoMode","gotoSyslogServer", "gotoNtpServer"); var $objectclasses = array("gotoWorkstationTemplate"); diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc index 08565d4d7..29db3ae49 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc @@ -263,12 +263,14 @@ class termgeneric extends plugin if (gosaSupportDaemon::ping($this->netConfigDNS->macAddress)){ $smarty->assign("actions", array( "halt" => _("Switch off"), "reboot" => _("Reboot"), - "memcheck" => _("Memory test"), - "sysinfo" => _("System analysis"))); + #"memcheck" => _("Memory test"), + #"sysinfo" => _("System analysis") + )); } else { $smarty->assign("actions", array("wake" => _("Wake up"), - "memcheck" => _("Memory test"), - "sysinfo" => _("System analysis"))); + #"memcheck" => _("Memory test"), + #"sysinfo" => _("System analysis") + )); } /* Arrays */ diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc index 1ccdc994b..9a8659e62 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc @@ -299,16 +299,18 @@ class workgeneric extends plugin "update" => _("Software update"), "reinstall" => _("Reinstall"), "rescan" => _("Rescan hardware"), - "memcheck" => _("Memory test"), + #"memcheck" => _("Memory test"), "localboot" => _("Force localboot"), - "sysinfo" => _("System analysis"))); + #"sysinfo" => _("System analysis") + )); } else { $smarty->assign("actions", array("wakeup" => _("Wake up"), "reinstall" => _("Reinstall"), "update" => _("Software update"), - "memcheck" => _("Memory test"), + #"memcheck" => _("Memory test"), "localboot" => _("Force localboot"), - "sysinfo" => _("System analysis"))); + #"sysinfo" => _("System analysis") + )); } /* Arrays */ $smarty->assign("modes", $this->modes); -- 2.30.2