From cf70c6b8520f8459e45c4701896bc86d05fe248b Mon Sep 17 00:00:00 2001 From: psc Date: Tue, 31 Mar 2009 15:12:35 +0000 Subject: [PATCH] Fix problems with empty boot params by partially reverting previously commits to this file, as proposed by mba. (Trac: #2298) git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13573 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../systems/goto/class_workstationStartup.inc | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc b/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc index 134ec2556..4d1eae951 100644 --- a/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc +++ b/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc @@ -7,9 +7,7 @@ class workstartup extends plugin var $gotoLdap_inherit = FALSE; /* Generic terminal attributes */ - # This is disabled as long there is no possiblilty to set these parameters - #var $bootmode = "G"; - var $bootmode = ""; + var $bootmode = "G"; var $gotoBootKernel = "default-inherited"; var $gotoKernelParameters = ""; var $gotoLdapServer = "default-inherited"; @@ -788,6 +786,21 @@ class workstartup extends plugin } } + if ($this->gotoKernelParameters == "") { + /* Add semi automatic values if empty */ + // FIXME: LDAP Server may not be set here... + $this->gotoKernelParameters= "ldap=".base64_encode($this->gotoLdapServer); + + switch ($this->bootmode){ + case "D": + $this->gotoKernelParameters.= " debug"; + break; + case "G": + $this->gotoKernelParameters.= " splash=silent"; + break; + } + } + plugin::save(); unset( $this->attrs['FAIrelease'] ); -- 2.30.2