Changes in uspace/app/sysinst/sysinst.c [4285f384:c24b0dcb] in mainline

File:

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

uspace/app/sysinst/sysinst.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <errno.h>
 #include <fdisk.h>
-#include <futil.h>
 #include <loc.h>
 #include <stdio.h>
@@ -50 +49 @@
 #include <vol.h>
 
+#include "futil.h"
 #include "grub.h"
 #include "rdimg.h"
@@ -62 +62 @@
  * in Grub notation).
  */
-#define DEFAULT_DEV_0 "devices/\\hw\\sys\\00:01.1\\c0d0"
-#define DEFAULT_DEV_1 "devices/\\hw\\sys\\00:01.0\\ata1\\c0d0"
+#define DEFAULT_DEV "devices/\\hw\\sys\\00:01.0\\ata-c1\\d0"
 //#define DEFAULT_DEV "devices/\\hw\\pci0\\00:01.2\\uhci_rh\\usb01_a1\\mass-storage0\\l0"
 /** Volume label for the new file system */
@@ -80 +79 @@
 #define BOOT_BLOCK_IDX 0 /* MBR */
 
-#define CFG_FILES_SRC "/cfg"
-#define CFG_FILES_DEST MOUNT_POINT "/cfg"
-
-static const char *default_devs[] = {
-        DEFAULT_DEV_0,
-        DEFAULT_DEV_1,
-        NULL
-};
-
 static const char *sys_dirs[] = {
         "/cfg",
-        "/data",
-        NULL
+        "/data"
 };
-
-/** Check the if the destination device exists.
- *
- * @param dev Disk device
- *
- * @return EOK on success or an error code
- */
-static errno_t sysinst_check_dev(const char *dev)
-{
-        service_id_t sid;
-        errno_t rc;
-
-        rc = loc_service_get_id(dev, &sid, 0);
-        if (rc != EOK)
-                return rc;
-
-        (void)sid;
-        return EOK;
-}
 
 /** Label the destination device.
@@ -230 +200 @@
         path = NULL;
 
-        /* Copy initial configuration files */
-        rc = futil_rcopy_contents(CFG_FILES_SRC, CFG_FILES_DEST);
-        if (rc != EOK)
-                return rc;
-
         return EOK;
 error:
@@ -279 +244 @@
         }
 
-        rv = asprintf(&path, "%s%s", rdpath, "/cfg/initvol.sif");
+        rv = asprintf(&path, "%s%s", rdpath, "/cfg/volsrv.sif");
         if (rv < 0) {
                 rc = ENOMEM;
@@ -306 +271 @@
                 printf("Error creating system partition configuration.\n");
                 rc = EIO;
-                goto error;
-        }
-
-        rc = vol_volumes_sync(volumes);
-        if (rc != EOK) {
-                printf("Error saving volume confiuration.\n");
                 goto error;
         }
@@ -402 +361 @@
 
         printf("sysinst_copy_boot_blocks: block_init.\n");
-        rc = block_init(sid);
+        rc = block_init(sid, 512);
         if (rc != EOK)
                 return rc;
@@ -475 +434 @@
         }
 
-        rc = vol_part_eject(vol, part_id, vef_physical);
+        rc = vol_part_eject(vol, part_id);
         if (rc != EOK) {
                 printf("Error ejecting volume.\n");
@@ -531 +490 @@
 int main(int argc, char *argv[])
 {
-        unsigned i;
-        errno_t rc;
-
-        i = 0;
-        while (default_devs[i] != NULL) {
-                rc = sysinst_check_dev(default_devs[i]);
-                if (rc == EOK)
-                        break;
-        }
-
-        if (default_devs[i] == NULL) {
-                printf("Cannot determine installation device.\n");
-                return 1;
-        }
-
-        return sysinst_install(default_devs[i]);
+        const char *dev = DEFAULT_DEV;
+        return sysinst_install(dev);
 }