startui: Move socket file checking around a bit
This commit is contained in:
parent
909d0ed289
commit
b8470f753b
@ -109,8 +109,6 @@ Result<int> luna_main(int argc, char** argv)
|
|||||||
StringView wind_command[] = { "/usr/bin/wind" };
|
StringView wind_command[] = { "/usr/bin/wind" };
|
||||||
TRY(os::Process::spawn(wind_command[0], Slice<StringView>(wind_command, 1)));
|
TRY(os::Process::spawn(wind_command[0], Slice<StringView>(wind_command, 1)));
|
||||||
|
|
||||||
TRY(wait_until_file_created("/tmp/wsys.sock", 10000));
|
|
||||||
|
|
||||||
clearenv();
|
clearenv();
|
||||||
chdir(pw->pw_dir);
|
chdir(pw->pw_dir);
|
||||||
setenv("PATH", "/usr/bin:/usr/local/bin", 1);
|
setenv("PATH", "/usr/bin:/usr/local/bin", 1);
|
||||||
@ -122,6 +120,9 @@ Result<int> luna_main(int argc, char** argv)
|
|||||||
StringView launch_command[] = { "/usr/bin/launch" };
|
StringView launch_command[] = { "/usr/bin/launch" };
|
||||||
TRY(spawn_process_as_user(Slice<StringView>(launch_command, 1), pw->pw_uid, pw->pw_gid, groups.slice()));
|
TRY(spawn_process_as_user(Slice<StringView>(launch_command, 1), pw->pw_uid, pw->pw_gid, groups.slice()));
|
||||||
|
|
||||||
|
TRY(wait_until_file_created("/tmp/wsys.sock", 10000));
|
||||||
|
TRY(wait_until_file_created("/tmp/launch.sock", 10000));
|
||||||
|
|
||||||
StringView taskbar_command[] = { "/usr/bin/taskbar" };
|
StringView taskbar_command[] = { "/usr/bin/taskbar" };
|
||||||
TRY(spawn_process_as_user(Slice<StringView>(taskbar_command, 1), pw->pw_uid, pw->pw_gid, system_groups.slice()));
|
TRY(spawn_process_as_user(Slice<StringView>(taskbar_command, 1), pw->pw_uid, pw->pw_gid, system_groups.slice()));
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user