brl/pH
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated with correct sommelier command arguments

Browse Source
This commit is contained in:
Bruce Leidl 2023-01-27 16:39:26 -05:00
parent f938e1a785
commit cdf41349fc
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ph-init/src/init.rs
View File

@ -89,7 +89,7 @@ impl InitServer {
} }
pub fn setup_filesystem(&self) -> Result<()> { pub fn setup_filesystem(&self) -> Result<()> {
mount_devtmpfs()?; //mount_devtmpfs()?;
mount_tmpfs("/tmp")?; mount_tmpfs("/tmp")?;
mkdir("/tmp/sysroot")?; mkdir("/tmp/sysroot")?;
if self.rootfs.read_only() { if self.rootfs.read_only() {
@ -206,17 +206,10 @@ impl InitServer {
self.services.insert(dbus.pid(), dbus); 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") let sommelier = ServiceLaunch::new("sommelier", "/opt/ph/usr/bin/sommelier")
.base_environment() .base_environment()
.uidgid(1000,1000) .uidgid(1000,1000)
.env("SOMMELIER_SHM_DRIVER", shm_driver) .arg("--parent")
.arg("--master")
.pipe_output() .pipe_output()
.launch()?; .launch()?;