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

Launch app_server in user context.

Browse Source 
This way, we get the user's environment variables, and so should
input_server, which is started by app_server.

This should, after 6 years, fix #12534. We may need to revisit this
when/if we add multiuser support, but that is a problem for another day.

Change-Id: I04698306bc68a585acd232e9f9d29c50bc170a1f
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4506
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Augustin Cavalier
2021-10-26 19:20:53 +00:00
committed by waddlesplash
parent b69c9008dd
commit a04b2f4c5e
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/launch/system
+2 -7
View File
@@ -5,10 +5,6 @@ service x-vnd.Haiku-registrar {
} }
} }
service x-vnd.Haiku-app_server {
launch /system/servers/app_server
}
service x-vnd.Haiku-debug_server { service x-vnd.Haiku-debug_server {
launch /system/servers/debug_server launch /system/servers/debug_server
} }
@@ -71,8 +67,7 @@ job x-vnd.Haiku-cddb_lookup {
on volume_mounted on volume_mounted
} }
target login { # target login
job x-vnd.Haiku-autologin { job x-vnd.Haiku-autologin {
launch /system/bin/autologin launch /system/bin/autologin
}
} }
data/launch/user
+6 -2
View File
@@ -1,6 +1,10 @@
target desktop { env /system/boot/SetupEnvironment
env /system/boot/SetupEnvironment
service x-vnd.Haiku-app_server {
launch /system/servers/app_server
}
target desktop {
service x-vnd.Be-TRAK { service x-vnd.Be-TRAK {
launch /system/Tracker launch /system/Tracker
legacy legacy
src/servers/app/AppServer.cpp
+3
View File
@@ -70,6 +70,8 @@ AppServer::AppServer(status_t* status)
// Create the bitmap allocator. Object declared in BitmapManager.cpp // Create the bitmap allocator. Object declared in BitmapManager.cpp
gBitmapManager = new BitmapManager(); gBitmapManager = new BitmapManager();
#if 0
// This is not presently needed, as app_server is launched from the login session.
#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST #ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
// TODO: check the attached displays, and launch login session for them // TODO: check the attached displays, and launch login session for them
BMessage data; BMessage data;
@@ -77,6 +79,7 @@ AppServer::AppServer(status_t* status)
data.AddInt32("session", 0); data.AddInt32("session", 0);
BLaunchRoster().Target("login", data); BLaunchRoster().Target("login", data);
#endif #endif
#endif
} }