Skip to contentSkip to conversation

Add rdinit parameter to pick early userspace init

PATCH New Olof Johansson 1 participant 1 message Aug 6, 2005 Documentation

lore
Share & tools
lore

Olof Johansson

author
#0 lore raw

PATCH 1/1 Add rdinit parameter to pick early userspace init

Hi,

This would be for -mm until 2.6.14 opens, I suppose:

Since early userspace was added, there's no way to override which init to run from it. Some people tack on an extra cpio archive with a link from /init depending on what they want to run, but that's sometimes impractical.

Changing the "init=" to also override the early userspace isn't feasible, since it is still used to indicate what init to run from disk when early userspace has completed doing whatever it's doing (i.e. load filesystem modules and drivers).

Instead, introduce "rdinit=" and make it override the default "/init" if specified.

Signed-off-by Olof Johansson <[email protected]>
init/main.c +23 -3
Index: 2.6/init/main.c
===================================================================
@@ -123,6 +123,7 @@ extern void softirq_init(void);
 char saved_command_line[COMMAND_LINE_SIZE];
 
 static char *execute_command;
+static char *ramdisk_execute_command;
 
 /* Setup configured maximum number of CPUs to activate */
 static unsigned int max_cpus = NR_CPUS;

@@ -297,6 +298,18 @@ static int __init init_setup(char *str)
 }
 __setup("init=", init_setup);
 
+static int __init rdinit_setup(char *str)
+{
+	unsigned int i;
+
+	ramdisk_execute_command = str;
+	/* See "auto" comment in init_setup */
+	for (i = 1; i < MAX_INIT_ARGS; i++)
+		argv_init[i] = NULL;
+	return 1;
+}
+__setup("rdinit=", rdinit_setup);
+
 extern void setup_arch(char **);
 
 #ifndef CONFIG_SMP

@@ -680,10 +693,14 @@ static int init(void * unused)
 	 * check if there is an early userspace init.  If yes, let it do all
 	 * the work
 	 */
-	if (sys_access((const char __user *) "/init", 0) == 0)
-		execute_command = "/init";
-	else
+
+	if (!ramdisk_execute_command)
+		ramdisk_execute_command = "/init";
+
+	if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
+		ramdisk_execute_command = NULL;
 		prepare_namespace();
+	}
 
 	/*
 	 * Ok, we have completed the initial bootup, and

@@ -708,6 +725,9 @@ static int init(void * unused)
 	 * trying to recover a really broken machine.
 	 */
 
+	if (ramdisk_execute_command)
+		run_init_process(ramdisk_execute_command);
+
 	if (execute_command)
 		run_init_process(execute_command);
Documentation/kernel-parameters.txt +5 -0
Index: 2.6/Documentation/kernel-parameters.txt
===================================================================
@@ -1169,6 +1169,11 @@ running once the system is up.
 			New name for the ramdisk parameter.
 			See Documentation/ramdisk.txt.
 
+	rdinit=		[KNL]
+			Format: <full_path>
+			Run specified binary instead of /init from the ramdisk,
+			used for early userspace startup. See initrd.
+
 	reboot=		[BUGS=IA-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
 			Format: <reboot_mode>[,<reboot_mode2>[,...]]
 			See arch/*/kernel/reboot.c.