summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@waldux.rocks>2018-03-05 19:49:23 (GMT)
committerWaldemar Brodkorb <wbx@waldux.rocks>2018-03-05 19:49:23 (GMT)
commit28c9ef633e856cc0e316b5b9e2764bebf15525fd (patch)
tree002c9f9d18231c3b3b76c2d4970ca99479a8643b /init
parentac28f968227377635865f9a2e713ba38edb941d0 (diff)
init: use /sbin/init for initramfs
With this small patch, which is used in OpenADK since a long time there is no special setup required for initramfs with piggyback.
Diffstat (limited to 'init')
-rw-r--r--init/initramfs.c3
-rw-r--r--init/main.c4
2 files changed, 6 insertions, 1 deletions
diff --git a/init/initramfs.c b/init/initramfs.c
index 981f286..65fa3a0 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -655,6 +655,9 @@ static int __init populate_rootfs(void)
*/
load_default_modules();
}
+#ifdef CONFIG_DEVTMPFS_MOUNT
+ devtmpfs_mount("dev");
+#endif
return 0;
}
rootfs_initcall(populate_rootfs);
diff --git a/init/main.c b/init/main.c
index 99f0265..8060daf 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1018,6 +1018,8 @@ static noinline void __init kernel_init_freeable(void)
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
pr_err("Warning: unable to open an initial console.\n");
+ printk(KERN_WARNING "Starting Waldux\n");
+
(void) sys_dup(0);
(void) sys_dup(0);
/*
@@ -1026,7 +1028,7 @@ static noinline void __init kernel_init_freeable(void)
*/
if (!ramdisk_execute_command)
- ramdisk_execute_command = "/init";
+ ramdisk_execute_command = "/sbin/init";
if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
ramdisk_execute_command = NULL;