Readded default in front of the default bootkernel

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

diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 10ef98a06c7ccb665e069c8fcd6e3075d6594ff5..fab6d1d1a46d5b4b10acc776806d7933c74efe34 100644 (file)
--- a/plugins/admin/systems/class_terminalStartup.inc
+++ b/plugins/admin/systems/class_terminalStartup.inc
@@ -97,15 +97,17 @@ class termstartup extends plugin
         while (!feof($fh)) {
           $buffer= trim(fgets($fh, 256));
 
-          $name=$value = $buffer;
-    
-          if(preg_match("/:/",$buffer)){
-            $name = preg_replace("/:.*$/","",$buffer);
-            $value= preg_replace("/^.*:/","",$buffer);
-          }
-
           if(!empty($buffer)){
-            $this->gotoBootKernels[$name]= $value;
+
+            $name=$value = $buffer;
+
+            if(preg_match("/:/",$buffer)){
+              $name = preg_replace("/:.*$/","",$buffer);
+              $value= preg_replace("/^.*:/","",$buffer);
+              $this->gotoBootKernels[$name]= $name.":".$value;
+            }else{
+              $this->gotoBootKernels[$name]= $value;
+            }
           }
         }
         pclose($fh);

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index cf0ca57859be926af756894445f528c6c4b78545..b9b5d1ec9e536f830462ce25ce322b8ccda54948 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -319,16 +319,18 @@ class workstartup extends plugin
         $fh= popen($command, "r");
         while (!feof($fh)) {
           $buffer= trim(fgets($fh, 256));
+  
+          if(!empty($buffer)){
 
-          $name= $value = $buffer;
-
-          if(preg_match("/:/",$buffer)){
-            $name  = preg_replace("/:.*$/","",$buffer);
-            $value = preg_replace("/^.*:/","",$buffer);
-          }
+            $name=$value = $buffer;
 
-          if ($buffer != ""){
-            $this->gotoBootKernels[$name]= $value;
+            if(preg_match("/:/",$buffer)){
+              $name = preg_replace("/:.*$/","",$buffer);
+              $value= preg_replace("/^.*:/","",$buffer);
+              $this->gotoBootKernels[$name]= $name.":".$value;
+            }else{
+              $this->gotoBootKernels[$name]= $value;
+            }
           }
         }
         pclose($fh);