From cdf41349fc39df0788767ae97e7e6afecc70608f Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Fri, 27 Jan 2023 16:39:26 -0500
Subject: [PATCH] Updated with correct sommelier command arguments

---
 ph-init/src/init.rs | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/ph-init/src/init.rs b/ph-init/src/init.rs
index 5809b37..27d5d03 100644
--- a/ph-init/src/init.rs
+++ b/ph-init/src/init.rs
@@ -89,7 +89,7 @@ impl InitServer {
     }
 
     pub fn setup_filesystem(&self) -> Result<()> {
-        mount_devtmpfs()?;
+        //mount_devtmpfs()?;
         mount_tmpfs("/tmp")?;
         mkdir("/tmp/sysroot")?;
         if self.rootfs.read_only() {
@@ -206,17 +206,10 @@ impl InitServer {
 
         self.services.insert(dbus.pid(), dbus);
 
-        let shm_driver = if self.cmdline.has_var("phinit.virtwl_dmabuf") {
-            "virtwl-dmabuf" 
-        } else {
-            "virtwl"
-        };
-
         let sommelier = ServiceLaunch::new("sommelier", "/opt/ph/usr/bin/sommelier")
             .base_environment()
             .uidgid(1000,1000)
-            .env("SOMMELIER_SHM_DRIVER", shm_driver)
-            .arg("--master")
+            .arg("--parent")
             .pipe_output()
             .launch()?;