lkml.org 
[lkml]   [2013]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 5/5] initmpfs v2: Use initramfs if rootfstype= or root= specified.
From: Rob Landley <rob@landley.net>

Command line option rootfstype=ramfs to obtain old initramfs behavior,
and use ramfs instead of tmpfs for stub when root= defined (for cosmetic
reasons).

Signed-off-by: Rob Landley <rob@landley.net>
---

init/do_mounts.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)

--- initold/init/do_mounts.c 2013-06-29 13:27:00.485256840 -0500
+++ initwork/init/do_mounts.c 2013-06-29 13:34:17.925275072 -0500
@@ -591,16 +591,20 @@
sys_chroot(".");
}

+static bool is_tmpfs;
static struct dentry *rootfs_mount(struct file_system_type *fs_type,
int flags, const char *dev_name, void *data)
{
static unsigned long once;
+ void *fill = ramfs_fill_super;

if (test_and_set_bit(1, &once))
return ERR_PTR(-ENODEV);

- return mount_nodev(fs_type, flags, data,
- IS_ENABLED(CONFIG_TMPFS) ? shmem_fill_super : ramfs_fill_super);
+ if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs)
+ fill = shmem_fill_super;
+
+ return mount_nodev(fs_type, flags, data, fill);
}

static struct file_system_type rootfs_fs_type = {
@@ -616,9 +620,12 @@
if (err)
return err;

- if (IS_ENABLED(CONFIG_TMPFS))
+ if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] &&
+ (!root_fs_names || strstr(root_fs_names, "tmpfs")))
+ {
err = shmem_init();
- else
+ is_tmpfs = true;
+ } else
err = init_ramfs_fs();

if (err)

\
 
 \ /
  Last update: 2013-07-17 02:21    [W:0.062 / U:2.316 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site