Exec bug fixes

aformatik · Sep 26, 2024 · 7208a65 · 7208a65
1 parent e15a88d
commit 7208a65
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/codchi/src/main.rs b/codchi/src/main.rs
@@ -43,7 +43,7 @@ fn main() -> anyhow::Result<()> {
         if cli.terminal == Some(false) {
             dbg_duration("hide console", || {
                 let window = unsafe { GetConsoleWindow() };
-                if window.0.is_null() {
+                if !window.0.is_null() {
                     if let Err(err) =
                         unsafe { ShowWindow(window, WindowsAndMessaging::SW_HIDE).ok() }
                     {

diff --git a/codchi/src/platform/linux/mod.rs b/codchi/src/platform/linux/mod.rs
@@ -261,6 +261,7 @@ tail -f "{log_file}"
         // Machine is started by issuing a command
         self.cmd()
             .script(r#"systemctl is-system-running | grep -E "running|degraded""#.to_string())
+            .with_user(LinuxUser::Default)
             .retry_until_ok();
 
         cancel_tx

diff --git a/codchi/src/platform/windows/host.rs b/codchi/src/platform/windows/host.rs
@@ -154,7 +154,7 @@ impl Host for HostImpl {
         if let Some((cmd, args)) = cmd.split_first() {
             Command::new(cmd)
                 .args(args)
-                .creation_flags(CREATE_NEW_PROCESS_GROUP.0 | CREATE_NEW_CONSOLE.0)
+                .creation_flags(CREATE_NEW_CONSOLE.0)
                 .spawn()?;
         } else {
             anyhow::bail!("Failed to open terminal with an empty command");

diff --git a/nix/container/machine/default.nix b/nix/container/machine/default.nix
@@ -81,7 +81,7 @@ in
         # TODO ?? Reset the logging file descriptors.
 
         echo "starting systemd..."
-        exec /run/current-system/systemd/lib/systemd/systemd "$@"
+        exec /run/current-system/systemd/lib/systemd/systemd "--log-target=kmsg" "$@"
       '';
   };