From 2cafbe753527bba9ab701744263a60a595deb0ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 7 Jun 2005 00:54:23 +0000 Subject: [PATCH] Since Bochs 2.2 can finally run the Haiku app_server, it is now enabled by default. Select "safe mode" in the boot menu to get to the old consoled. Note, if you're using VESA mode, make sure you run in 32 bit, or the app_server will crash. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12965 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- data/system/boot/Bootscript | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript index a3d8becb5d..7a6b0a265c 100644 --- a/data/system/boot/Bootscript +++ b/data/system/boot/Bootscript @@ -71,17 +71,27 @@ fi # Launch servers # We must wait for the app_server and registrar to be ready -launch $SERVERS/fake_app_server picasso -#launch $SERVERS/app_server picasso # launch app_server -launch $SERVERS/registrar _roster_thread_ # launch registrar +if [ "$SAFEMODE" != "yes" ]; then + launch $SERVERS/app_server picasso # launch app_server +else + launch $SERVERS/fake_app_server picasso +fi + +launch $SERVERS/registrar _roster_thread_ # launch registrar launch $SERVERS/debug_server # launch debug_server if [ "$SAFEMODE" != "yes" ]; then launch $SERVERS/syslog_daemon + # ToDo: the input_server is supposed to be started by the app_server + launch $SERVERS/input_server fi -# Launch consoled (to be removed later - this starts the mini console) -launch beos/bin/consoled +# Launch MiniTerminal or consoled depending on $SAFEMODE +if [ "$SAFEMODE" != "yes" ]; then + launch beos/apps/MiniTerminal +else + launch beos/bin/consoled +fi # Check for daily saving time # TODO to be launched when tracker and deskbar are launched