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

File:

• uspace/srv/system/system.c (modified) (11 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.
@@ -35 +35 @@
  */
 
-#include <devman.h>
 #include <fibril.h>
 #include <futil.h>
@@ -49 +48 @@
 #include <str.h>
 #include <loc.h>
-#include <shutdown.h>
 #include <str_error.h>
 #include <config.h>
@@ -86 +84 @@
 
 static void system_srv_conn(ipc_call_t *, void *);
-static errno_t system_srv_poweroff(void *);
-static errno_t system_srv_restart(void *);
+static errno_t system_srv_shutdown(void *);
 
 system_ops_t system_srv_ops = {
-        .poweroff = system_srv_poweroff,
-        .restart = system_srv_restart
+        .shutdown = system_srv_shutdown
 };
 
@@ -328 +324 @@
         size_t nparts;
         bool sv_mounted;
-        futil_t *futil = NULL;
         size_t i;
         errno_t rc;
@@ -381 +376 @@
 
                 /* Copy initial configuration files */
-                rc = futil_create(NULL, NULL, &futil);
+                rc = futil_rcopy_contents("/cfg", "/w/cfg");
                 if (rc != EOK)
                         goto error;
-
-                rc = futil_rcopy_contents(futil, "/cfg", "/w/cfg");
-                if (rc != EOK)
-                        goto error;
-
-                futil_destroy(futil);
-                futil = NULL;
         } else {
                 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");
+                }
         }
 
@@ -437 +426 @@
         if (part_ids != NULL)
                 free(part_ids);
-        if (futil != NULL)
-                futil_destroy(futil);
 
         return rc;
@@ -533 +520 @@
         /* Eject all volumes. */
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "Ejecting volumes.");
-
         rc = vol_create(&vol);
         if (rc != EOK) {
@@ -549 +534 @@
 
         for (i = 0; i < nparts; i++) {
-                rc = vol_part_eject(vol, part_ids[i], vef_none);
+                rc = vol_part_eject(vol, part_ids[i]);
                 if (rc != EOK) {
                         log_msg(LOG_DEFAULT, LVL_ERROR, "Error ejecting "
@@ -559 +544 @@
         free(part_ids);
         vol_destroy(vol);
-
         return EOK;
 error:
@@ -626 +610 @@
 }
 
-/** System poweroff request.
+/** System shutdown request.
  *
  * @param arg Argument (sys_srv_t *)
  */
-static errno_t system_srv_poweroff(void *arg)
+static errno_t system_srv_shutdown(void *arg)
 {
         sys_srv_t *syssrv = (sys_srv_t *)arg;
         errno_t rc;
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_poweroff");
+        log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_shutdown");
 
         rc = system_sys_shutdown();
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_poweroff failed");
+                log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_shutdown failed");
                 system_srv_shutdown_failed(&syssrv->srv);
         }
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_poweroff complete");
-        system_srv_shutdown_complete(&syssrv->srv);
-        return EOK;
-}
-
-/** System restart request.
- *
- * @param arg Argument (sys_srv_t *)
- */
-static errno_t system_srv_restart(void *arg)
-{
-        sys_srv_t *syssrv = (sys_srv_t *)arg;
-        errno_t rc;
-
-        log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_restart");
-
-        rc = system_sys_shutdown();
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_restart failed");
-                system_srv_shutdown_failed(&syssrv->srv);
-        }
-
-        /* Quiesce the device tree. */
-
-        log_msg(LOG_DEFAULT, LVL_NOTE, "Quiescing devices.");
-
-        rc = devman_quiesce_devices("/hw");
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "Failed to quiesce device tree.");
-                return rc;
-        }
-
-        sys_reboot();
-
-        log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_restart complete");
+        log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_shutdown complete");
         system_srv_shutdown_complete(&syssrv->srv);
         return EOK;