drop stdin for exec sync

as i don't think there's a way it can be passed in Signed-off-by: Peter Hunt~ <[email protected]>
containers · Sep 22, 2022 · 3c733ba · 3c733ba
1 parent 0ad3325
commit 3c733ba
Show file tree

Hide file tree

Showing 3 changed files with 139 additions and 150 deletions.
diff --git a/conmon-rs/common/proto/conmon.capnp b/conmon-rs/common/proto/conmon.capnp
@@ -65,7 +65,6 @@ interface Conmon {
         timeoutSec @1 :UInt64;
         command @2 :List(Text);
         terminal @3 :Bool;
-        stdin @4 :Bool;
     }
 
     struct ExecSyncContainerResponse {

diff --git a/conmon-rs/server/src/rpc.rs b/conmon-rs/server/src/rpc.rs
@@ -202,12 +202,11 @@ impl conmon::Server for Server {
 
         let command = pry!(req.get_command());
         let args = pry_err!(self.generate_exec_sync_args(&id, &pidfile, &container_io, &command));
-        let stdin = req.get_stdin();
 
         Promise::from_future(
             async move {
                 match child_reaper
-                    .create_child(&runtime, &args, stdin, &mut container_io, &pidfile)
+                    .create_child(&runtime, &args, false, &mut container_io, &pidfile)
                     .await
                 {
                     Ok((grandchild_pid, token)) => {

diff --git a/internal/proto/conmon.capnp.go b/internal/proto/conmon.capnp.go