Changeset 90ee338 in mainline

Timestamp:

2025-04-06T17:08:19Z (22 hours ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Parents:

59e32fb

Message:

Allow sysinst to restart the system at the end of installation.

When -r option is passed.

Location:

uspace/app/sysinst

Files:

• meson.build (modified) (1 diff)
• sysinst.c (modified) (6 diffs)

uspace/app/sysinst/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'block', 'fdisk', 'futil', 'sif' ]
+deps = [ 'block', 'fdisk', 'futil', 'sif', 'system' ]
 src = files(
         'rdimg.c',

uspace/app/sysinst/sysinst.c

@@ -47 +47 @@
 #include <str.h>
 #include <str_error.h>
+#include <system.h>
 #include <vfs/vfs.h>
 #include <vol.h>
@@ -94 +95 @@
         NULL
 };
+
+static bool restart = false;
+
+static fibril_mutex_t shutdown_lock;
+static fibril_condvar_t shutdown_cv;
+static bool shutdown_stopped;
+static bool shutdown_failed;
+
+static void sysinst_shutdown_complete(void *);
+static void sysinst_shutdown_failed(void *);
+
+static system_cb_t sysinst_system_cb = {
+        .shutdown_complete = sysinst_shutdown_complete,
+        .shutdown_failed = sysinst_shutdown_failed
+};
+
+/** System shutdown complete.
+ *
+ * @param arg Argument (shutdown_t *)
+ */
+static void sysinst_shutdown_complete(void *arg)
+{
+        (void)arg;
+
+        fibril_mutex_lock(&shutdown_lock);
+        shutdown_stopped = true;
+        shutdown_failed = false;
+        fibril_condvar_broadcast(&shutdown_cv);
+        fibril_mutex_unlock(&shutdown_lock);
+}
+
+/** System shutdown failed.
+ *
+ * @param arg Argument (not used)
+ */
+static void sysinst_shutdown_failed(void *arg)
+{
+        (void)arg;
+
+        fibril_mutex_lock(&shutdown_lock);
+        shutdown_stopped = true;
+        shutdown_failed = true;
+        fibril_condvar_broadcast(&shutdown_cv);
+        fibril_mutex_unlock(&shutdown_lock);
+}
 
 /** Check the if the destination device exists.
@@ -487 +533 @@
 }
 
+/** Restart the system.
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_restart(void)
+{
+        errno_t rc;
+        system_t *system;
+
+        fibril_mutex_initialize(&shutdown_lock);
+        fibril_condvar_initialize(&shutdown_cv);
+        shutdown_stopped = false;
+        shutdown_failed = false;
+
+        rc = system_open(SYSTEM_DEFAULT, &sysinst_system_cb, NULL, &system);
+        if (rc != EOK) {
+                printf("Failed opening system control service.\n");
+                return rc;
+        }
+
+        rc = system_restart(system);
+        if (rc != EOK) {
+                system_close(system);
+                printf("Failed requesting system restart.\n");
+                return rc;
+        }
+
+        fibril_mutex_lock(&shutdown_lock);
+        printf("The system is shutting down...\n");
+        while (!shutdown_stopped)
+                fibril_condvar_wait(&shutdown_cv, &shutdown_lock);
+
+        if (shutdown_failed) {
+                printf("Shutdown failed.\n");
+                system_close(system);
+                return rc;
+        }
+
+        printf("Shutdown complete. It is now safe to remove power.\n");
+
+        /* Sleep forever */
+        while (true)
+                fibril_condvar_wait(&shutdown_cv, &shutdown_lock);
+
+        fibril_mutex_unlock(&shutdown_lock);
+
+        system_close(system);
+        return 0;
+
+}
+
 /** Install system to a device.
  *
@@ -526 +623 @@
                 return rc;
 
+        rc = sysinst_restart();
+        if (rc != EOK)
+                return rc;
+
         return EOK;
 }
@@ -533 +634 @@
         unsigned i;
         errno_t rc;
+
+        if (argc > 1 && str_cmp(argv[1], "-r") == 0)
+                restart = true;
 
         i = 0;
@@ -539 +643 @@
                 if (rc == EOK)
                         break;
+                ++i;
         }