Changeset b6f8f69 in mainline

Timestamp:

2024-05-21T15:45:23Z (6 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

9b95b964

Parents:

3526f4f3

Message:

Attempt to deal with changing disk device names in sysinst

File:

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

uspace/app/sysinst/sysinst.c

@@ -62 +62 @@
  * in Grub notation).
  */
-#define DEFAULT_DEV "devices/\\hw\\sys\\00:01.0\\ata1\\c0d0"
+#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 */
 
+static const char *default_devs[] = {
+        DEFAULT_DEV_0,
+        DEFAULT_DEV_1,
+        NULL
+};
+
 static const char *sys_dirs[] = {
         "/cfg",
         "/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.
@@ -490 +516 @@
 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]);
 }