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

Timestamp:

2018-06-29T15:40:10Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5e904dd

Parents:

1e472ee (diff), 1a9174e (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.

Message:

Merge volume management improvements (still WIP).

File:

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

uspace/app/sysinst/sysinst.c

@@ -69 +69 @@
 #define MOUNT_POINT "/inst"
 
-/** Device containing HelenOS live CD */
-#define CD_DEV "devices/\\hw\\pci0\\00:01.0\\ata-c2\\d0"
-
-#define CD_FS_TYPE "cdfs"
-#define CD_FS_SRV "/srv/cdfs"
-#define CD_MOUNT_POINT "/cdrom"
-
-#define BOOT_FILES_SRC "/cdrom"
+/** HelenOS live CD volume label */
+#define CD_VOL_LABEL "HelenOS-CD"
+#define CD_MOUNT_POINT "/vol/" CD_VOL_LABEL
+
+#define BOOT_FILES_SRC CD_MOUNT_POINT
 #define BOOT_BLOCK_IDX 0 /* MBR */
 
@@ -196 +193 @@
 static errno_t sysinst_copy_boot_files(void)
 {
-        task_wait_t twait;
-        task_exit_t texit;
-        errno_t rc;
-        int trc;
-
-        printf("sysinst_copy_boot_files(): start filesystem server\n");
-        rc = task_spawnl(NULL, &twait, CD_FS_SRV, CD_FS_SRV, NULL);
-        if (rc != EOK)
-                return rc;
-
-        printf("sysinst_copy_boot_files(): wait for filesystem server\n");
-        rc = task_wait(&twait, &texit, &trc);
-        if (rc != EOK)
-                return rc;
-
-        printf("sysinst_copy_boot_files(): verify filesystem server result\n");
-        if (texit != TASK_EXIT_NORMAL || trc != 0) {
-                printf("sysinst_fs_mount(): not successful, but could be already loaded.\n");
-        }
-
-        printf("sysinst_copy_boot_files(): create CD mount point\n");
-        rc = vfs_link_path(CD_MOUNT_POINT, KIND_DIRECTORY, NULL);
-        if (rc != EOK)
-                return rc;
-
-        printf("sysinst_copy_boot_files(): mount CD filesystem\n");
-        rc = vfs_mount_path(CD_MOUNT_POINT, CD_FS_TYPE, CD_DEV, "", 0, 0);
-        if (rc != EOK)
-                return rc;
+        errno_t rc;
 
         printf("sysinst_copy_boot_files(): copy bootloader files\n");