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

Commit 1b0a5816 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "init: early_services: Mount modem partition early in kernel"

parents eb61aa65 e29e7fbe
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ static char saved_early_userspace[64] __initdata;
static char init_prog[128] = "/early_services/init_early";
static char *init_prog_argv[2] = { init_prog, NULL };
#define EARLY_SERVICES_MOUNT_POINT "/early_services"
#define FIRMWARE_MOUNT_PATH "/early_services/vendor/firmware_mnt"
#endif
dev_t ROOT_DEV;

@@ -617,9 +618,12 @@ void __init launch_early_services(void)
{
	int rc = 0;

	devtmpfs_mount("dev");
	rc = mount_partition(saved_early_userspace, EARLY_SERVICES_MOUNT_POINT);
	place_marker("Early Services Partition ready");
	if (!rc) {
		place_marker("Early Services Partition ready");
		if (!mount_partition(saved_modem_name, FIRMWARE_MOUNT_PATH))
			place_marker("firmwares Partition ready");
		rc = call_usermodehelper(init_prog, init_prog_argv, NULL, 0);
		if (!rc)
			pr_info("early_init launched\n");
+1 −1
Original line number Diff line number Diff line
@@ -1092,8 +1092,8 @@ static noinline void __init kernel_init_freeable(void)
	if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
		ramdisk_execute_command = NULL;
		prepare_namespace();
		launch_early_services();
	}
	launch_early_services();

	/*
	 * Ok, we have completed the initial bootup, and