Changes in uspace/app/init/init.c [dc2d582:73d8600] in mainline

File:

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

uspace/app/init/init.c

@@ -49 +49 @@
 #include <loc.h>
 #include <str_error.h>
+#include <config.h>
 #include "init.h"
 
@@ -126 +127 @@
                 opts = "restore";
         
-        int rc = mount(fstype, ROOT_MOUNT_POINT, ROOT_DEVICE, opts,
+        int rc = vfs_mount(fstype, ROOT_MOUNT_POINT, ROOT_DEVICE, opts,
             IPC_FLAG_BLOCKING, 0);
         return mount_report("Root filesystem", ROOT_MOUNT_POINT, fstype,
@@ -143 +144 @@
 static bool mount_locfs(void)
 {
-        int rc = mount(LOCFS_FS_TYPE, LOCFS_MOUNT_POINT, "", "",
+        int rc = vfs_mount(LOCFS_FS_TYPE, LOCFS_MOUNT_POINT, "", "",
             IPC_FLAG_BLOCKING, 0);
         return mount_report("Location service filesystem", LOCFS_MOUNT_POINT,
@@ -152 +153 @@
 {
         struct stat s;
-        if (stat(path, &s) == ENOENT) {
+        if (stat(path, &s) != 0) {
                 printf("%s: Unable to stat %s\n", NAME, path);
                 return ENOENT;
@@ -299 +300 @@
 static bool mount_tmpfs(void)
 {
-        int rc = mount(TMPFS_FS_TYPE, TMPFS_MOUNT_POINT, "", "", 0, 0);
+        int rc = vfs_mount(TMPFS_FS_TYPE, TMPFS_MOUNT_POINT, "", "", 0, 0);
         return mount_report("Temporary filesystem", TMPFS_MOUNT_POINT,
             TMPFS_FS_TYPE, NULL, rc);
@@ -306 +307 @@
 int main(int argc, char *argv[])
 {
+        int rc;
+
         info_print();
         
@@ -356 +359 @@
         srv_start("/srv/hound");
         
-        int rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);
-        if (rc == EOK) {
-                gui_start("/app/barber", HID_COMPOSITOR_SERVER);
-                gui_start("/app/vlaunch", HID_COMPOSITOR_SERVER);
-                gui_start("/app/vterm", HID_COMPOSITOR_SERVER);
+        if (!config_key_exists("console")) {
+                rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);
+                if (rc == EOK) {
+                        gui_start("/app/barber", HID_COMPOSITOR_SERVER);
+                        gui_start("/app/vlaunch", HID_COMPOSITOR_SERVER);
+                        gui_start("/app/vterm", HID_COMPOSITOR_SERVER);
+                }
         }