Skip to content

Replace hardcoded init.krun with generic virtual file overlay #673

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

Draft
mtjhrc wants to merge 13 commits into
base: main
Choose a base branch
from
Draft

Replace hardcoded init.krun with generic virtual file overlay #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
612a74a
virtio/fs: move init binary blob into its own crate
mtjhrc May 11, 2026
cf3145d
virtio/fs: introduce InodeAllocator for shared inode numbering
mtjhrc May 4, 2026
8c5c68e
virtio/fs: introduce generic AugmentFs overlay for files like init.krun
mtjhrc May 4, 2026
d214cc8
lib: add krun_disable_implicit_init()
mtjhrc May 4, 2026
6eed1e1
lib: add krun_fs_add_overlay_file()
mtjhrc May 4, 2026
942d396
lib: add krun_get_default_init()
mtjhrc May 6, 2026
51716c1
libkrun.h: document that implicit resource creation will become opt-in
mtjhrc May 4, 2026
24caab5
virtio/fs: add NullFs, a minimal empty-root FileSystem
mtjhrc May 5, 2026
1b94214
lib: rewrite krun_set_root_disk_remount to use newly introduced NullFs
mtjhrc May 5, 2026
d413cde
virtio/fs: remove REMOVE_ROOT_DIR ioctl and allow_root_dir_delete
mtjhrc May 5, 2026
b3615e3
virtio/fs: move EXIT_CODE ioctl to AugmentFs
mtjhrc May 5, 2026
1a5b09e
tests: add augmentfs integration test
mtjhrc May 6, 2026
89a7101
tests: add root-disk-remount integration test
mtjhrc May 11, 2026
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
5 changes: 5 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[workspace]
members = [
"src/libkrun",
"src/init-blob",
"src/input",
"src/display",
"src/utils",
Expand Down
8 changes: 7 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,13 @@ TEST_FLAGS ?=
EXTRA_LIBPATH_Linux =
EXTRA_LIBPATH_Darwin = /opt/homebrew/opt/libkrunfw/lib:/opt/homebrew/opt/llvm/lib

# Extra cargo features for the test runner (passed via KRUN_TEST_FEATURES).
TEST_FEATURE_FLAGS :=
ifeq ($(BLK),1)
TEST_FEATURE_FLAGS += blk
endif

# On macOS, SIP strips DYLD_LIBRARY_PATH when executing scripts via a shebang,
# so we pass the path via LIBKRUN_LIB_PATH and let run.sh set the real variable.
test: test-prefix
cd tests; RUST_LOG=trace LIBKRUN_LIB_PATH="$$(realpath ../test-prefix/$(LIBDIR_$(OS))/):$(EXTRA_LIBPATH_$(OS))" PKG_CONFIG_PATH="$$(realpath ../test-prefix/$(LIBDIR_$(OS))/pkgconfig/)" ./run.sh test --test-case "$(TEST)" $(TEST_FLAGS)
cd tests; RUST_LOG=trace KRUN_TEST_FEATURES="$(TEST_FEATURE_FLAGS)" LIBKRUN_LIB_PATH="$$(realpath ../test-prefix/$(LIBDIR_$(OS))/):$(EXTRA_LIBPATH_$(OS))" PKG_CONFIG_PATH="$$(realpath ../test-prefix/$(LIBDIR_$(OS))/pkgconfig/)" ./run.sh test --test-case "$(TEST)" $(TEST_FLAGS)
752 changes: 436 additions & 316 deletions include/libkrun.h
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/devices/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "krun-devices"
version = "0.1.0-1.18.0"
authors = ["The libkrun Authors"]
edition = "2021"
build = "build.rs"

description = "Virtual device emulation for libkrun"
license = "Apache-2.0"
repository = "https://github.com/containers/libkrun"
Expand Down
Loading
Loading