Changeset 368ee04 in mainline for uspace/app/sysinst/sysinst.c

Timestamp:

2017-04-05T18:10:39Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (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 from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

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

uspace/app/sysinst/sysinst.c

@@ -43 +43 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include <task.h>
 #include <vfs/vfs.h>
@@ -175 +174 @@
                 return EIO;
 
-        rc = mkdir(MOUNT_POINT, 0);
+        rc = vfs_link_path(MOUNT_POINT, KIND_DIRECTORY, NULL);
         if (rc != EOK)
                 return rc;
 
         printf("sysinst_fs_mount(): mount filesystem\n");
-        rc = vfs_mount(FS_TYPE, MOUNT_POINT, dev, "", 0, 0);
+        rc = vfs_mount_path(MOUNT_POINT, FS_TYPE, dev, "", 0, 0);
         if (rc != EOK)
                 return rc;
@@ -214 +213 @@
 
         printf("sysinst_copy_boot_files(): create CD mount point\n");
-        rc = mkdir(CD_MOUNT_POINT, 0);
+        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(CD_FS_TYPE, CD_MOUNT_POINT, CD_DEV, "", 0, 0);
+        rc = vfs_mount_path(CD_MOUNT_POINT, CD_FS_TYPE, CD_DEV, "", 0, 0);
         if (rc != EOK)
                 return rc;
@@ -229 +228 @@
 
         printf("sysinst_copy_boot_files(): unmount %s\n", MOUNT_POINT);
-        rc = vfs_unmount(MOUNT_POINT);
+        rc = vfs_unmount_path(MOUNT_POINT);
         if (rc != EOK)
                 return rc;