Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Passthru NixOS system & OpenGL Driver #38

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Passthru NixOS system & OpenGL Driver #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions crates/krun-guest/src/mount.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
use std::fs::File;
use std::fs::{File, create_dir_all};
use std::env::var_os;
use std::os::fd::AsFd;

use anyhow::{Context, Result};
use rustix::fs::CWD;
use rustix::mount::{mount2, move_mount, open_tree, MountFlags, MoveMountFlags, OpenTreeFlags};
use rustix::mount::{mount2, move_mount, mount_recursive_bind, open_tree, MountFlags, MoveMountFlags, OpenTreeFlags};

pub fn mount_filesystems() -> Result<()> {
mount2(
Expand Down Expand Up @@ -40,6 +41,26 @@ pub fn mount_filesystems() -> Result<()> {
.context("Failed to move_mount `/etc/resolv.conf`")?;
}

let opengl_driver = var_os("OPENGL_DRIVER");
if let Some(dir) = opengl_driver {
create_dir_all("/run/opengl-driver")?;
mount_recursive_bind(
dir,
"/run/opengl-driver",
)
.context("Failed to mount `/run/opengl-driver`")?;
}

let nixos_curr_sys = var_os("NIXOS_CURRENT_SYSTEM");
if let Some(dir) = nixos_curr_sys {
create_dir_all("/run/current-system")?;
mount_recursive_bind(
dir,
"/run/current-system",
)
.context("Failed to mount `/run/current-system`")?;
}

mount2(
Some("binfmt_misc"),
"/proc/sys/fs/binfmt_misc",
Expand Down
4 changes: 3 additions & 1 deletion crates/krun/src/env.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ use utils::env::find_in_path;

/// Automatically pass these environment variables to the microVM, if they are
/// set.
const WELL_KNOWN_ENV_VARS: [&str; 5] = [
const WELL_KNOWN_ENV_VARS: [&str; 7] = [
"LD_LIBRARY_PATH",
"LIBGL_DRIVERS_PATH",
"MESA_LOADER_DRIVER_OVERRIDE", // needed for asahi
"PATH", // needed by `krun-guest` program
"RUST_LOG",
"OPENGL_DRIVER", // needed for OpenGL on NixOS
"NIXOS_CURRENT_SYSTEM", // needed for some paths to work on NixOS
];

/// See https://github.com/AsahiLinux/docs/wiki/Devices
Expand Down