support arguments in boot configs

Author: obfuscatedgenerated

src/initial_fs_setup.ts

@@ -16,7 +16,7 @@ const setup_boot = async (fs: AbstractFileSystem) => {
     }
 
     // create etc directory if it doesn't exist
-    const absolute_etc = fs.absolute("/etc");;
+    const absolute_etc = fs.absolute("/etc");
     if (!(await fs.dir_exists(absolute_etc))) {
         await fs.make_dir(absolute_etc);
     }
@@ -29,7 +29,7 @@ const setup_boot = async (fs: AbstractFileSystem) => {
     }
 
     // create default_shell file if it doesn't exist
-    const default_shell_content = "ash";
+    const default_shell_content = "ash --login";
     const absolute_default_shell = fs.absolute("/etc/default_shell");
     if (!(await fs.exists(absolute_default_shell))) {
         await fs.write_file(absolute_default_shell, default_shell_content);

src/kernel.ts

@@ -163,6 +163,7 @@ export class Kernel {
 
         // read /boot/init to determine init system
         let init_program: string;
+        let init_args: string[] = [];
 
         try {
             const init_data = await fs.read_file("/boot/init") as string;
@@ -177,9 +178,17 @@ export class Kernel {
             return false;
         }
 
+        // separate args if any
+        const init_parts = init_program.split(" ");
+        init_program = init_parts[0];
+
+        if (init_parts.length > 1) {
+            init_args = init_parts.slice(1);
+        }
+
         // run init program
         try {
-            const init = this.spawn(init_program, []);
+            const init = this.spawn(init_program, init_args);
 
             if (init.process.pid !== 1) {
                 this.panic(`init program ${init_program} did not start as PID 1!`);

src/programs/core/ignition/index.ts

@@ -69,6 +69,7 @@ export default {
 
         // determine boot target from /etc/boot_target
         let boot_target = "jetty";
+        let boot_args: string[] = [];
 
         try {
             const boot_target_data = await fs.read_file("/etc/boot_target") as string;
@@ -87,6 +88,14 @@ export default {
             await new Promise((resolve) => setTimeout(resolve, 3000));
         }
 
+        // separate args if any
+        const boot_target_parts = boot_target.split(" ");
+        boot_target = boot_target_parts[0];
+
+        if (boot_target_parts.length > 1) {
+            boot_args = boot_target_parts.slice(1);
+        }
+
         // create service manager
         const svc_mgr = new ServiceManager(kernel);
 
@@ -193,7 +202,7 @@ export default {
 
         // execute boot target in a respawn loop
         while (running) {
-            const boot_target_proc = kernel.spawn(boot_target, []);
+            const boot_target_proc = kernel.spawn(boot_target, boot_args);
             current_tty_process = boot_target_proc.process;
 
             const exit_code = await boot_target_proc.completion;

src/programs/core/jetty.ts

@@ -17,6 +17,7 @@ export default {
 
         // determine default shell from /etc/default_shell
         let default_shell = "ash";
+        let default_shell_args: string[] = [];
 
         try {
             const default_shell_data = await fs.read_file("/etc/default_shell") as string;
@@ -35,6 +36,14 @@ export default {
             await new Promise((resolve) => setTimeout(resolve, 3000));
         }
 
+        // separate shell args if any
+        const default_shell_parts = default_shell.split(" ");
+        default_shell = default_shell_parts[0];
+
+        if (default_shell_parts.length > 1) {
+            default_shell_args = default_shell_parts.slice(1);
+        }
+
         let running = true;
         let final_code = 0;
         let current_shell_process: ProcessContext;
@@ -53,7 +62,7 @@ export default {
 
         // execute shell in a respawn loop
         while (running) {
-            const shell_proc = kernel.spawn(default_shell, ["--login"]);
+            const shell_proc = kernel.spawn(default_shell, default_shell_args);
             current_shell_process = shell_proc.process;
 
             const exit_code = await shell_proc.completion;