Remove sommelier support.

WhatAmISupposedToPutHere · slp · commit f123d70a10b0 · 2025-01-27T10:42:45.000+01:00
It is in the way for a refactor i want to do, and you should be
using x11bridge anyway.

Signed-off-by: Sasha Finkelstein &lt;fnkl.kernel@gmail.com&gt;
diff --git a/crates/muvm/src/bin/muvm.rs b/crates/muvm/src/bin/muvm.rs
@@ -416,16 +416,13 @@ fn main() -> Result<ExitCode> {
     );
     env.insert("MUVM_SERVER_COOKIE".to_owned(), cookie.to_string());
 
-    if !options.sommelier {
-        let display =
-            env::var("DISPLAY").context("X11 forwarding requested but DISPLAY is unset")?;
-        env.insert("HOST_DISPLAY".to_string(), display);
-
-        // And forward XAUTHORITY. This will be modified to fix the
-        // display name in muvm-guest.
-        if let Ok(xauthority) = env::var("XAUTHORITY") {
-            env.insert("XAUTHORITY".to_string(), xauthority);
-        }
+    let display = env::var("DISPLAY").context("X11 forwarding requested but DISPLAY is unset")?;
+    env.insert("HOST_DISPLAY".to_string(), display);
+
+    // And forward XAUTHORITY. This will be modified to fix the
+    // display name in muvm-guest.
+    if let Ok(xauthority) = env::var("XAUTHORITY") {
+        env.insert("XAUTHORITY".to_string(), xauthority);
     }
 
     let mut krun_config = KrunConfig {
diff --git a/crates/muvm/src/cli_options.rs b/crates/muvm/src/cli_options.rs
@@ -17,7 +17,6 @@ pub struct Options {
     pub server_port: u32,
     pub fex_images: Vec<String>,
     pub merged_rootfs: bool,
-    pub sommelier: bool,
     pub interactive: bool,
     pub tty: bool,
     pub command: PathBuf,
@@ -111,9 +110,6 @@ pub fn options() -> OptionParser<Options> {
         .argument("SERVER_PORT")
         .fallback(3334)
         .display_fallback();
-    let sommelier = long("sommelier")
-        .help("Use sommelier + XWayland instead of x11bridge")
-        .switch();
     let interactive = long("interactive")
         .short('i')
         .help("Attach to the command's stdin/out after starting it")
@@ -139,7 +135,6 @@ pub fn options() -> OptionParser<Options> {
         server_port,
         fex_images,
         merged_rootfs,
-        sommelier,
         interactive,
         tty,
         // positionals
diff --git a/crates/muvm/src/guest/bin/muvm-guest.rs b/crates/muvm/src/guest/bin/muvm-guest.rs
@@ -11,7 +11,6 @@ use muvm::guest::fex::setup_fex;
 use muvm::guest::mount::mount_filesystems;
 use muvm::guest::net::configure_network;
 use muvm::guest::socket::setup_socket_proxy;
-use muvm::guest::sommelier::exec_sommelier;
 use muvm::guest::user::setup_user;
 use muvm::guest::x11::setup_x11_forwarding;
 use rustix::process::{getrlimit, setrlimit, Resource};
@@ -80,13 +79,8 @@ fn main() -> Result<()> {
     let pulse_path = pulse_path.join("native");
     setup_socket_proxy(pulse_path, 3333)?;
 
-    if !setup_x11_forwarding(run_path)? {
-        // Will not return if successful.
-        exec_sommelier(&options.command, &options.command_args)
-            .context("Failed to execute sommelier")?;
-    }
+    setup_x11_forwarding(run_path)?;
 
-    // Fallback option if sommelier is not present or for direct X11 mode.
     debug!(command:? = options.command, command_args:? = options.command_args; "exec");
     let err = Command::new(&options.command)
         .args(options.command_args)
diff --git a/crates/muvm/src/guest/mod.rs b/crates/muvm/src/guest/mod.rs
@@ -3,6 +3,5 @@ pub mod fex;
 pub mod mount;
 pub mod net;
 pub mod socket;
-pub mod sommelier;
 pub mod user;
 pub mod x11;
diff --git a/crates/muvm/src/guest/sommelier.rs b/crates/muvm/src/guest/sommelier.rs
