From d8c9b228163b6e06b01e79dff76a7364a2ba8c7f Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Fri, 22 May 2009 20:17:27 +0000
Subject: minor changes

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2874 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 boot-env/OpenSLX/BootEnvironment/PrebootCD.pm   | 2 +-
 boot-env/OpenSLX/MakeInitRamFS/Distro/Scilin.pm | 2 +-
 boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm   | 2 +-
 boot-env/preboot/preboot.sh                     | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm b/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
index 60d0b2ba..f6afbcba 100644
--- a/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
+++ b/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
@@ -59,7 +59,7 @@ sub _createImage
 
     # write trivial isolinux config
     my $isolinuxConfig = unshiftHereDoc(<<"    End-of-Here");
-        PROMPT 0
+        PROMPT 1
         TIMEOUT 100
         DEFAULT OpenSLX
 
diff --git a/boot-env/OpenSLX/MakeInitRamFS/Distro/Scilin.pm b/boot-env/OpenSLX/MakeInitRamFS/Distro/Scilin.pm
index 14049224..942aab66 100644
--- a/boot-env/OpenSLX/MakeInitRamFS/Distro/Scilin.pm
+++ b/boot-env/OpenSLX/MakeInitRamFS/Distro/Scilin.pm
@@ -38,7 +38,7 @@ sub applyChanges
     my $self   = shift;
     my $engine = shift;
     # filter modules which are part of the main kernel already
-    $engine->_addFilteredKernelModules( qw( af_packet hid usbhid unix ));
+    $engine->_addFilteredKernelModules( qw( af_packet hid usbhid unix vesafb fbcon));
 
     return;
 }
diff --git a/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm b/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm
index a7eca483..b553516a 100644
--- a/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm
+++ b/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm
@@ -37,7 +37,7 @@ sub applyChanges
     my $self   = shift;
     my $engine = shift;
 
-    $engine->_addFilteredKernelModules( qw( hid unix ));
+    $engine->_addFilteredKernelModules( qw( hid unix vesafb fbcon));
 
     return;
 }
diff --git a/boot-env/preboot/preboot.sh b/boot-env/preboot/preboot.sh
index cbb33a98..4a05847f 100755
--- a/boot-env/preboot/preboot.sh
+++ b/boot-env/preboot/preboot.sh
@@ -36,7 +36,6 @@ if [ x$debuglevel != x0 ]; then
 else
     debug=""
 fi 
-ash
 
 # bring the mac address into the standard format 01-<MAC>
 client=$(echo 01-$macaddr|sed "s/:/-/g")
@@ -52,6 +51,9 @@ wget -O /tmp/initramfs $boot_uri/$initramfs
 # read primary IP configuration to pass it on
 . /tmp/ipstuff
 
+clear
+ash
+
 # start the new kernel with initialramfs and composed cmdline
 echo "Booting OpenSLX client $label ..."
 kexec -l /tmp/kernel --initrd=/tmp/initramfs \
-- 
cgit v1.2.3-55-g7522