Disabled memcheck and sysinfo for now

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11543 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc b/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc
index e84b55aab99914428de63a47dcacb72b9e761837..1171a885d462ea21673282283d95612ed891c67b 100644 (file)
--- 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 08565d4d76ae74a09efc36026edee2350828b321..29db3ae491b65125c2f23831e567a8e18cd5961d 100644 (file)
--- 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 1ccdc994b848643b2f152009ab7441985cb14db8..9a8659e62da74cd77976895e41b3d6b980a6c1e7 100644 (file)
--- 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);