Changeset ebb1489 in mainline for uspace/app/init/init.c

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (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.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

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

uspace/app/init/init.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2005 Martin Decky
  * All rights reserved.
@@ -35 +36 @@
 
 #include <fibril.h>
+#include <futil.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -78 +80 @@
 static const char *sys_dirs[] = {
         "/w/cfg",
-        "/w/data"
+        "/w/data",
+        NULL,
 };
 
@@ -351 +354 @@
         vol_info_t vinfo;
         volume_id_t *volume_ids = NULL;
+        service_id_t *part_ids = NULL;
+        vol_part_info_t pinfo;
         size_t nvols;
+        size_t nparts;
+        bool sv_mounted;
         size_t i;
         errno_t rc;
@@ -385 +392 @@
         }
 
-        vol_destroy(vol);
         free(volume_ids);
+        volume_ids = NULL;
 
         if (!found_cfg) {
@@ -397 +404 @@
                                 printf("%s: Error creating directory '%s'.\n",
                                     NAME, *cp);
-                                return rc;
+                                goto error;
                         }
 
                         ++cp;
                 }
+
+                /* Copy initial configuration files */
+                rc = futil_rcopy_contents("/cfg", "/w/cfg");
+                if (rc != EOK)
+                        goto error;
         } else {
                 printf("%s: System volume is configured.\n", NAME);
-        }
-
+
+                /* Wait until system volume is mounted */
+                sv_mounted = false;
+
+                while (true) {
+                        rc = vol_get_parts(vol, &part_ids, &nparts);
+                        if (rc != EOK) {
+                                printf("Error getting list of volumes.\n");
+                                goto error;
+                        }
+
+                        for (i = 0; i < nparts; i++) {
+                                rc = vol_part_info(vol, part_ids[i], &pinfo);
+                                if (rc != EOK) {
+                                        printf("Error getting partition "
+                                            "information.\n");
+                                        rc = EIO;
+                                        goto error;
+                                }
+
+                                if (str_cmp(pinfo.cur_mp, "/w") == 0) {
+                                        sv_mounted = true;
+                                        break;
+                                }
+                        }
+
+                        if (sv_mounted)
+                                break;
+
+                        free(part_ids);
+                        part_ids = NULL;
+
+                        fibril_sleep(1);
+                        printf("Sleeping(1) for system volume.\n");
+                }
+        }
+
+        vol_destroy(vol);
         return EOK;
 error:
@@ -411 +459 @@
         if (volume_ids != NULL)
                 free(volume_ids);
+        if (part_ids != NULL)
+                free(part_ids);
 
         return rc;
@@ -438 +488 @@
         srv_start("/srv/klog");
         srv_start("/srv/fs/locfs");
-        srv_start("/srv/taskmon");
 
         if (!mount_locfs()) {
@@ -454 +503 @@
         srv_start("/srv/volsrv");
 
+        init_sysvol();
+
+        srv_start("/srv/taskmon");
+
         srv_start("/srv/net/loopip");
         srv_start("/srv/net/ethip");
+        srv_start("/srv/net/dhcp");
         srv_start("/srv/net/inetsrv");
         srv_start("/srv/net/tcp");
         srv_start("/srv/net/udp");
         srv_start("/srv/net/dnsrsrv");
-        srv_start("/srv/net/dhcp");
-        srv_start("/srv/net/nconfsrv");
 
         srv_start("/srv/clipboard");
@@ -469 +521 @@
         srv_start("/srv/hid/output", HID_OUTPUT);
         srv_start("/srv/audio/hound");
-
-        init_sysvol();
 
 #ifdef CONFIG_WINSYS