dfvd

Author: shinohara-rin

dist/index.js

@@ -31130,13 +31130,14 @@ function setup_sshkey(pubkey, qemu_process, ready_callback) {
   qemu_process.stdin.write("root\n");
   let waitForPrompt = waitFor("root@freebsd:", () => {
     waitForPrompt = () => { }
+    let waitForKey = waitFor(pubkeyContent, () => {
+      ready_callback(qemu_process)
+    })
+    qemu_process.stdout.on('data', waitForKey)
     qemu_process.stdin.write("echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config\n");
     qemu_process.stdin.write("/etc/rc.d/sshd restart\n");
     qemu_process.stdin.write(`echo "${pubkeyContent}" > /root/.ssh/authorized_keys\n`);
     qemu_process.stdin.write(`cat /root/.ssh/authorized_keys\n`);
-    let waitForKey = waitFor(pubkeyContent, () => {
-      ready_callback(qemu_process)
-    })
   })
   qemu_process.stdout.on('data', (data) => {
     waitForPrompt(data)

index.js

@@ -240,13 +240,14 @@ function setup_sshkey(pubkey, qemu_process, ready_callback) {
   qemu_process.stdin.write("root\n");
   let waitForPrompt = waitFor("root@freebsd:", () => {
     waitForPrompt = () => { }
+    let waitForKey = waitFor(pubkeyContent, () => {
+      ready_callback(qemu_process)
+    })
+    qemu_process.stdout.on('data', waitForKey)
     qemu_process.stdin.write("echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config\n");
     qemu_process.stdin.write("/etc/rc.d/sshd restart\n");
     qemu_process.stdin.write(`echo "${pubkeyContent}" > /root/.ssh/authorized_keys\n`);
     qemu_process.stdin.write(`cat /root/.ssh/authorized_keys\n`);
-    let waitForKey = waitFor(pubkeyContent, () => {
-      ready_callback(qemu_process)
-    })
   })
   qemu_process.stdout.on('data', (data) => {
     waitForPrompt(data)