Changeset 75701004 in mainline

Timestamp:

2018-06-07T16:07:26Z (7 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

931afbc

Parents:

18ad56a8

Message:

use a TAR as the archive format for populating TMPFS root file system

Also remove the logic of populating a TMPFS file system from the TMPFS
file system driver. A more elegant separation of concerns is to populate
the file system from the client. This is now done by the init task (if
required) and should work universally for any file system.

Files:

• boot/Makefile.common (modified) (1 diff)
• boot/Makefile.initrd (modified) (1 diff)
• tools/autotool.py (modified) (1 diff)
• tools/mktmpfs.py (deleted)
• uspace/app/init/Makefile (modified) (1 diff)
• uspace/app/init/init.c (modified) (6 diffs)
• uspace/app/init/untar.c (added)
• uspace/app/init/untar.h (added)
• uspace/srv/fs/tmpfs/Makefile (modified) (1 diff)
• uspace/srv/fs/tmpfs/tmpfs.h (modified) (1 diff)
• uspace/srv/fs/tmpfs/tmpfs_dump.c (deleted)
• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (1 diff)

boot/Makefile.common

@@ -52 +52 @@
 
 MKARRAY = $(TOOLS_PATH)/mkarray.py
-MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
 MKFAT = $(TOOLS_PATH)/mkfat.py
 MKEXT4 = $(TOOLS_PATH)/mkext4.py

boot/Makefile.initrd

@@ -29 +29 @@
 $(INITRD).img:
 ifeq ($(RDFMT),tmpfs)
-        $(MKTMPFS) $(DIST_PATH) $@
+        tar -c -f $@ -C $(DIST_PATH) .
 endif
 ifeq ($(RDFMT),fat)

tools/autotool.py

@@ -579 +579 @@
                 check_app(["make", "--version"], "Make utility", "preferably GNU Make")
                 check_app(["unzip"], "unzip utility", "usually part of zip/unzip utilities")
+                check_app(["tar", "--version"], "tar utility", "usually part of tar")
 
                 platform, cc_args, target = get_target(config)

uspace/app/init/Makefile

@@ -32 +32 @@
 STATIC_NEEDED = y
 
+LIBS = untar block
+
 SOURCES = \
-        init.c
+        init.c \
+        untar.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/init/init.c

@@ -48 +48 @@
 #include <config.h>
 #include <io/logctl.h>
+#include "untar.h"
 #include "init.h"
 
@@ -83 +84 @@
         switch (rc) {
         case EOK:
-                if (dev != NULL)
+                if ((dev != NULL) && (str_cmp(dev, "") != 0))
                         printf("%s: %s mounted on %s (%s at %s)\n", NAME, desc, mntpt,
                             fstype, dev);
@@ -107 +108 @@
 }
 
-/** Mount root filesystem
- *
- * The operation blocks until the root filesystem
+/** Mount root file system
+ *
+ * The operation blocks until the root file system
  * server is ready for mounting.
  *
- * @param[in] fstype Root filesystem type.
+ * @param[in] fstype Root file system type.
  *
  * @return True on success.
@@ -120 +121 @@
 static bool mount_root(const char *fstype)
 {
-        const char *opts = "";
-
-        if (str_cmp(fstype, "tmpfs") == 0)
-                opts = "restore";
-
-        errno_t rc = vfs_mount_path(ROOT_MOUNT_POINT, fstype, ROOT_DEVICE, opts,
+        const char *root_device = "";
+
+        if (str_cmp(fstype, "tmpfs") != 0)
+                root_device = ROOT_DEVICE;
+
+        errno_t rc = vfs_mount_path(ROOT_MOUNT_POINT, fstype, root_device, "",
             IPC_FLAG_BLOCKING, 0);
         if (rc == EOK)
                 logctl_set_root();
-        return mount_report("Root filesystem", ROOT_MOUNT_POINT, fstype,
-            ROOT_DEVICE, rc);
-}
-
-/** Mount locfs filesystem
- *
- * The operation blocks until the locfs filesystem
+
+        bool ret = mount_report("Root file system", ROOT_MOUNT_POINT, fstype,
+            root_device, rc);
+
+        rc = vfs_cwd_set(ROOT_MOUNT_POINT);
+        if (rc != EOK) {
+                printf("%s: Unable to set current directory to %s (%s)\n",
+                    NAME, ROOT_MOUNT_POINT, str_error(ret));
+                return false;
+        }
+
+        if ((ret) && (str_cmp(fstype, "tmpfs") == 0)) {
+                printf("%s: Extracting root file system archive\n", NAME);
+                ret = bd_untar(ROOT_DEVICE);
+        }
+
+        return ret;
+}
+
+/** Mount locfs file system
+ *
+ * The operation blocks until the locfs file system
  * server is ready for mounting.
  *
@@ -146 +162 @@
         errno_t rc = vfs_mount_path(LOCFS_MOUNT_POINT, LOCFS_FS_TYPE, "", "",
             IPC_FLAG_BLOCKING, 0);
-        return mount_report("Location service filesystem", LOCFS_MOUNT_POINT,
+        return mount_report("Location service file system", LOCFS_MOUNT_POINT,
             LOCFS_FS_TYPE, NULL, rc);
 }
@@ -301 +317 @@
 {
         errno_t rc = vfs_mount_path(TMPFS_MOUNT_POINT, TMPFS_FS_TYPE, "", "", 0, 0);
-        return mount_report("Temporary filesystem", TMPFS_MOUNT_POINT,
+        return mount_report("Temporary file system", TMPFS_MOUNT_POINT,
             TMPFS_FS_TYPE, NULL, rc);
 }

uspace/srv/fs/tmpfs/Makefile

@@ -35 +35 @@
 SOURCES = \
         tmpfs.c \
-        tmpfs_ops.c \
-        tmpfs_dump.c
+        tmpfs_ops.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/srv/fs/tmpfs/tmpfs.h

@@ -74 +74 @@
 
 extern bool tmpfs_init(void);
-extern bool tmpfs_restore(service_id_t);
 
 #endif

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -447 +447 @@
         assert(rc == EOK);
         tmpfs_node_t *rootp = TMPFS_NODE(rootfn);
-        if (str_cmp(opts, "restore") == 0) {
-                if (!tmpfs_restore(service_id))
-                        return ELIMIT;
-        }
 
         *index = rootp->index;