i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Removed the fake_app_server from the build, and launch the usual system

Browse Source 
in safe mode.
* Removed the Terminal from the Bootscript.
* Ordered the servers alphabetically in HaikuImage.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32379 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-08-14 17:55:28 +00:00
parent 655a969f84
commit 6bfb1e8b2a
2 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+3 -3
View File
@@ -84,9 +84,9 @@ SYSTEM_LIBS = libbe.so $(HAIKU_SHARED_LIBSTDC++) libmedia.so libtracker.so
libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so
libilmimf.so $(HAIKU_SHARED_LIBSUPC++) libilmimf.so $(HAIKU_SHARED_LIBSUPC++)
; ;
SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server SYSTEM_SERVERS = app_server cddb_daemon debug_server input_server mail_daemon
net_server media_addon_server input_server app_server fake_app_server media_addon_server media_server midi_server net_server print_server
midi_server print_server mail_daemon cddb_daemon registrar syslog_daemon
; ;
SYSTEM_NETWORK_DEVICES = ethernet loopback ; SYSTEM_NETWORK_DEVICES = ethernet loopback ;
data/system/boot/Bootscript
+10 -20
View File
@@ -93,11 +93,7 @@ if [ "$SAFEMODE" != "yes" ]; then
launch $SERVERS/net_server # launch net_server launch $SERVERS/net_server # launch net_server
fi fi
if [ "$SAFEMODE" != "yes" ]; then launch $SERVERS/app_server picasso # launch app_server
launch $SERVERS/app_server picasso # launch app_server
else
launch $SERVERS/fake_app_server picasso
fi
if [ "$SAFEMODE" != "yes" ]; then if [ "$SAFEMODE" != "yes" ]; then
launch $SERVERS/syslog_daemon launch $SERVERS/syslog_daemon
@@ -114,22 +110,16 @@ if [ "$isReadOnly" = "yes" ]; then
fi fi
# Launch Terminal or consoled depending on $SAFEMODE if [ -e /etc/users ]; then
if [ "$SAFEMODE" != "yes" ]; then launch system/Login
if [ -e /etc/users ]; then # nothing more
launch system/Login
# nothing more
else
cd /boot/home
launch system/Tracker
launch system/Deskbar
# install ProcessController in the deskbar
(sleep 7; /boot/system/apps/ProcessController -deskbar) &
fi
launch system/apps/Terminal
else else
launch system/bin/consoled cd /boot/home
launch system/Tracker
launch system/Deskbar
# install ProcessController in the deskbar
(sleep 7; /boot/system/apps/ProcessController -deskbar) &
fi fi
if [ "$SAFEMODE" != "yes" ]; then if [ "$SAFEMODE" != "yes" ]; then