Changes in uspace/srv/system/system.c [b1490d2:ad9e225] in mainline

File:

• uspace/srv/system/system.c (modified) (2 diffs)

uspace/srv/system/system.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2005 Martin Decky
  * All rights reserved.
@@ -382 +382 @@
                 printf("%s: System volume is configured.\n", NAME);
 
-                /* Verify that system volume is mounted */
+                /* Wait until system volume is mounted */
                 sv_mounted = false;
 
-                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);
+                while (true) {
+                        rc = vol_get_parts(vol, &part_ids, &nparts);
                         if (rc != EOK) {
-                                printf("Error getting partition "
-                                    "information.\n");
-                                rc = EIO;
+                                printf("Error getting list of volumes.\n");
                                 goto error;
                         }
 
-                        if (str_cmp(pinfo.cur_mp, "/w") == 0) {
-                                sv_mounted = true;
+                        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;
-                        }
-                }
-
-                if (sv_mounted == false) {
-                        printf("System volume not found.\n");
-                        rc = EIO;
-                        goto error;
-                }
-
-                free(part_ids);
-                part_ids = NULL;
-
+
+                        free(part_ids);
+                        part_ids = NULL;
+
+                        fibril_sleep(1);
+                        printf("Sleeping(1) for system volume.\n");
+                }
         }