Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 844541f1 authored by Luca Weiss's avatar Luca Weiss
Browse files

init: adjustments for retrofitted dynamic partitions 

The bootloader is still configured for system-as-root and passes cmdline
options that are incompatible with the retrofitted dynamic partitions.
Adjust the kernel to ignore those parameters to make the new setup work.

Issue: FP3-A11#146
Change-Id: Idb918a4936af898e267daab8cc7a80f94bce6fb8
parent f7857a42

init/do_mounts.c

+2 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ dev_t name_to_dev_t(const char *name) 
}

EXPORT_SYMBOL_GPL(name_to_dev_t);



#if 0

static int __init root_dev_setup(char *line)

{

	strlcpy(saved_root_name, line, sizeof(saved_root_name));
@@ -307,6 +308,7 @@ static int __init rootwait_setup(char *str) 
}



__setup("rootwait", rootwait_setup);

#endif



static char * __initdata root_mount_data;

static int __init root_data_setup(char *str)

init/initramfs.c

+2 −0
Original line number Diff line number Diff line
@@ -609,6 +609,7 @@ static void __init clean_rootfs(void) 


static int __initdata do_skip_initramfs;



#if 0

static int __init skip_initramfs_param(char *str)

{

	if (*str)
@@ -617,6 +618,7 @@ static int __init skip_initramfs_param(char *str) 
	return 1;

}

__setup("skip_initramfs", skip_initramfs_param);

#endif



static int __init populate_rootfs(void)

{