Changeset ebb1489 in mainline for uspace/app/sysinst/sysinst.c

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

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

uspace/app/sysinst/sysinst.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2018 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <errno.h>
 #include <fdisk.h>
+#include <futil.h>
 #include <loc.h>
 #include <stdio.h>
@@ -49 +50 @@
 #include <vol.h>
 
-#include "futil.h"
 #include "grub.h"
 #include "rdimg.h"
@@ -62 +62 @@
  * in Grub notation).
  */
-#define DEFAULT_DEV "devices/\\hw\\sys\\00:01.0\\ata-c1\\d0"
+#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\\pci0\\00:01.2\\uhci_rh\\usb01_a1\\mass-storage0\\l0"
 /** Volume label for the new file system */
@@ -79 +80 @@
 #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"
+        "/data",
+        NULL
 };
+
+/** 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.
@@ -200 +230 @@
         path = NULL;
 
+        /* Copy initial configuration files */
+        rc = futil_rcopy_contents(CFG_FILES_SRC, CFG_FILES_DEST);
+        if (rc != EOK)
+                return rc;
+
         return EOK;
 error:
@@ -244 +279 @@
         }
 
-        rv = asprintf(&path, "%s%s", rdpath, "/cfg/volsrv.sif");
+        rv = asprintf(&path, "%s%s", rdpath, "/cfg/initvol.sif");
         if (rv < 0) {
                 rc = ENOMEM;
@@ -271 +306 @@
                 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;
         }
@@ -361 +402 @@
 
         printf("sysinst_copy_boot_blocks: block_init.\n");
-        rc = block_init(sid, 512);
+        rc = block_init(sid);
         if (rc != EOK)
                 return rc;
@@ -490 +531 @@
 int main(int argc, char *argv[])
 {
-        const char *dev = DEFAULT_DEV;
-        return sysinst_install(dev);
+        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]);
 }