Changeset 5126f80 in mainline for uspace/app/sysinst/sysinst.c

Timestamp:

2017-03-08T11:42:17Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0d35511

Parents:

a737667e

git-author:

Jiri Zarevucky <zarevucky.jiri@…> (2017-03-08 11:42:17)

git-committer:

Jakub Jermar <jakub@…> (2017-03-08 11:42:17)

Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5/ revision 1946

Original commit messages:

1946: Jiri Zarevucky 2013-08-06 Relativize mount, add root handle to libc and remove root from VFS server. This wraps up the "relativization" phase.

Breakage:

• Dynamic builds broken
• Mount table lookups by name

File:

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

uspace/app/sysinst/sysinst.c

@@ -180 +180 @@
 
         printf("sysinst_fs_mount(): mount filesystem\n");
-        rc = vfs_mount(FS_TYPE, MOUNT_POINT, dev, "", 0, 0);
+        rc = mount(FS_TYPE, MOUNT_POINT, dev, "", 0, 0);
         if (rc != EOK)
                 return rc;
@@ -219 +219 @@
 
         printf("sysinst_copy_boot_files(): mount CD filesystem\n");
-        rc = vfs_mount(CD_FS_TYPE, CD_MOUNT_POINT, CD_DEV, "", 0, 0);
+        rc = mount(CD_FS_TYPE, CD_MOUNT_POINT, CD_DEV, "", 0, 0);
         if (rc != EOK)
                 return rc;
@@ -229 +229 @@
 
         printf("sysinst_copy_boot_files(): unmount %s\n", MOUNT_POINT);
-        rc = vfs_unmount(MOUNT_POINT);
+        rc = unmount(MOUNT_POINT);
         if (rc != EOK)
                 return rc;