Changes in uspace/app/sysinst/sysinst.c [90ee338:ca127f37] in mainline

File:

• uspace/app/sysinst/sysinst.c (modified) (9 diffs)

uspace/app/sysinst/sysinst.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -47 +47 @@
 #include <str.h>
 #include <str_error.h>
-#include <system.h>
 #include <vfs/vfs.h>
 #include <vol.h>
@@ -64 +63 @@
  */
 #define DEFAULT_DEV_0 "devices/\\hw\\sys\\00:01.1\\c0d0"
-#define DEFAULT_DEV_1 "devices/\\hw\\sys\\00:01.0\\ide1\\c0d0"
+#define DEFAULT_DEV_1 "devices/\\hw\\sys\\00:01.0\\ata1\\c0d0"
 //#define DEFAULT_DEV "devices/\\hw\\pci0\\00:01.2\\uhci_rh\\usb01_a1\\mass-storage0\\l0"
 /** Volume label for the new file system */
@@ -95 +94 @@
         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.
@@ -521 +475 @@
         }
 
-        rc = vol_part_eject(vol, part_id, vef_physical);
+        rc = vol_part_eject(vol, part_id);
         if (rc != EOK) {
                 printf("Error ejecting volume.\n");
@@ -533 +487 @@
 }
 
-/** 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.
  *
@@ -623 +526 @@
                 return rc;
 
-        rc = sysinst_restart();
-        if (rc != EOK)
-                return rc;
-
         return EOK;
 }
@@ -634 +533 @@
         unsigned i;
         errno_t rc;
-
-        if (argc > 1 && str_cmp(argv[1], "-r") == 0)
-                restart = true;
 
         i = 0;
@@ -643 +539 @@
                 if (rc == EOK)
                         break;
-                ++i;
         }