Changeset 7e38970d in mainline for uspace/app/init/init.c

Timestamp:

2020-12-07T00:08:37Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

25f26600

Parents:

7a873f0 (diff), 8596474 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'jxsvoboda-gfx' into master

File:

• uspace/app/init/init.c (modified) (3 diffs)

uspace/app/init/init.c

@@ -277 +277 @@
 }
 
-static int app_start(const char *app)
+static int app_start(const char *app, const char *arg)
 {
         printf("%s: Spawning %s\n", NAME, app);
@@ -283 +283 @@
         task_id_t id;
         task_wait_t wait;
-        errno_t rc = task_spawnl(&id, &wait, app, app, NULL);
+        errno_t rc = task_spawnl(&id, &wait, app, app, arg, NULL);
         if (rc != EOK) {
                 oom_check(rc, app);
@@ -471 +471 @@
                 rc = display_server();
                 if (rc == EOK) {
-                        app_start("/app/barber");
-                        app_start("/app/vlaunch");
-                        app_start("/app/vterm");
+                        app_start("/app/launcher", NULL);
+                        app_start("/app/barber", NULL);
+                        app_start("/app/terminal", "-topleft");
                 }
         }