Changeset 973ef9fc in mainline for uspace/app/init/init.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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 mainline changes.

File:

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

uspace/app/init/init.c

@@ -57 +57 @@
 #define DEVFS_MOUNT_POINT  "/dev"
 
-#define SCRATCH_FS_TYPE      "tmpfs"
-#define SCRATCH_MOUNT_POINT  "/scratch"
+#define TMPFS_FS_TYPE      "tmpfs"
+#define TMPFS_MOUNT_POINT  "/tmp"
 
 #define DATA_FS_TYPE      "fat"
@@ -235 +235 @@
 }
 
-static bool mount_scratch(void)
-{
-        int rc = mount(SCRATCH_FS_TYPE, SCRATCH_MOUNT_POINT, "", "", 0);
-        return mount_report("Scratch filesystem", SCRATCH_MOUNT_POINT,
-            SCRATCH_FS_TYPE, NULL, rc);
+static bool mount_tmpfs(void)
+{
+        int rc = mount(TMPFS_FS_TYPE, TMPFS_MOUNT_POINT, "", "", 0);
+        return mount_report("Temporary filesystem", TMPFS_MOUNT_POINT,
+            TMPFS_FS_TYPE, NULL, rc);
 }
 
@@ -271 +271 @@
         }
         
-        mount_scratch();
+        mount_tmpfs();
         
         spawn("/srv/fhc");