Compare commits
11
Commits
589afef4f5
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
 hulthe
|
bfda3e626a | ||
|
hulthe
|
53587780c3 | ||
|
hulthe
|
8d97fc16c8 | ||
|
hulthe
|
a24e1efe31 | ||
|
hulthe
|
8782baa705 | ||
|
hulthe
|
d7613a4987 | ||
 marvin
|
3a99da196d | ||
|
marvin
|
6111bbeb8d | ||
|
marvin
|
524ef3e793 | ||
|
hulthe
|
5960cfe430 | ||
|
hulthe
|
c2a9f00fc0 |
@@ -0,0 +1,4 @@
|
||||
[submodule "linux"]
|
||||
path = kernel/linux
|
||||
url = https://github.com/torvalds/linux.git
|
||||
shallow = true
|
||||
Generated
+88
-129
@@ -65,10 +65,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.13.1"
|
||||
name = "base64"
|
||||
version = "0.23.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
|
||||
checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
|
||||
|
||||
[[package]]
|
||||
name = "boco"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"base64",
|
||||
"clap",
|
||||
"flate2",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"tempfile",
|
||||
"xdg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "boco-init"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"nix",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
@@ -76,6 +104,12 @@ version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
|
||||
|
||||
[[package]]
|
||||
name = "cfg_aliases"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527"
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.6.6"
|
||||
@@ -122,12 +156,6 @@ version = "1.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
|
||||
|
||||
[[package]]
|
||||
name = "cpio"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "938e716cb1ade5d6c8f959c13a7248b889c07491fc7e41167c3afe20f8f0de1e"
|
||||
|
||||
[[package]]
|
||||
name = "crc32fast"
|
||||
version = "1.5.1"
|
||||
@@ -137,12 +165,6 @@ dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "equivalent"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.3.14"
|
||||
@@ -161,12 +183,13 @@ checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
|
||||
|
||||
[[package]]
|
||||
name = "flate2"
|
||||
version = "1.1.9"
|
||||
version = "1.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
|
||||
checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb"
|
||||
dependencies = [
|
||||
"crc32fast",
|
||||
"miniz_oxide",
|
||||
"zlib-rs",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -180,34 +203,24 @@ dependencies = [
|
||||
"r-efi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.17.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "2.14.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "07aa2048142242915a31d35844fb311e0e53fcca590c3a0a40dcf1b841fa09eb"
|
||||
dependencies = [
|
||||
"equivalent",
|
||||
"hashbrown",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "is_terminal_polyfill"
|
||||
version = "1.70.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.189"
|
||||
@@ -221,15 +234,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
|
||||
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.8.9"
|
||||
name = "memchr"
|
||||
version = "2.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
|
||||
checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
|
||||
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b63fbc4a50860e98e7b2aa7804ded1db5cbc3aff9193adaff57a6931bf7c4b4c"
|
||||
dependencies = [
|
||||
"adler2",
|
||||
"simd-adler32",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nix"
|
||||
version = "0.31.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cfg-if",
|
||||
"cfg_aliases",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.21.4"
|
||||
@@ -279,15 +310,6 @@ dependencies = [
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "same-file"
|
||||
version = "1.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
|
||||
dependencies = [
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.229"
|
||||
@@ -319,12 +341,16 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_spanned"
|
||||
version = "1.1.1"
|
||||
name = "serde_json"
|
||||
version = "1.0.151"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
|
||||
checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"memchr",
|
||||
"serde",
|
||||
"serde_core",
|
||||
"zmij",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -333,21 +359,6 @@ version = "0.3.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea"
|
||||
|
||||
[[package]]
|
||||
name = "slim"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
"cpio",
|
||||
"flate2",
|
||||
"serde",
|
||||
"tempfile",
|
||||
"toml",
|
||||
"walkdir",
|
||||
"xdg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.11.1"
|
||||
@@ -356,9 +367,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "3.0.4"
|
||||
version = "3.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e6275cddf4610d1775e6d1fe9469b2e77d0f39fd98fb7450901b821e0c53649f"
|
||||
checksum = "12df2e0110f65b775f769bb17ef989067a1d931b2eb822bd4346631eeada89f9"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -378,45 +389,6 @@ dependencies = [
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "1.1.4+spec-1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3aace63f4bbcdfc2c965b059de67119c89c4017a70d633be6c104910f67056f5"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"serde_core",
|
||||
"serde_spanned",
|
||||
"toml_datetime",
|
||||
"toml_parser",
|
||||
"toml_writer",
|
||||
"winnow",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml_datetime"
|
||||
version = "1.1.1+spec-1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
|
||||
dependencies = [
|
||||
"serde_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml_parser"
|
||||
version = "1.1.3+spec-1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56"
|
||||
dependencies = [
|
||||
"winnow",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml_writer"
|
||||
version = "1.1.2+spec-1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.24"
|
||||
@@ -429,25 +401,6 @@ version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
||||
|
||||
[[package]]
|
||||
name = "walkdir"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
|
||||
dependencies = [
|
||||
"same-file",
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-util"
|
||||
version = "0.1.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
|
||||
dependencies = [
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-link"
|
||||
version = "0.2.1"
|
||||
@@ -463,14 +416,20 @@ dependencies = [
|
||||
"windows-link",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
|
||||
|
||||
[[package]]
|
||||
name = "xdg"
|
||||
version = "3.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2fb433233f2df9344722454bc7e96465c9d03bff9d77c248f9e7523fe79585b5"
|
||||
|
||||
[[package]]
|
||||
name = "zlib-rs"
|
||||
version = "0.6.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "34b31d188d9d685a4f9c7b46d6e36631b07058d2cfe190267adce54dc230bf12"
|
||||
|
||||
[[package]]
|
||||
name = "zmij"
|
||||
version = "1.0.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
|
||||
|
||||
+12
-5
@@ -1,18 +1,25 @@
|
||||
[workspace]
|
||||
members = [".", "init"]
|
||||
|
||||
[profile.release]
|
||||
opt-level = "z"
|
||||
lto = true
|
||||
strip = true
|
||||
|
||||
[package]
|
||||
name = "slim"
|
||||
name = "boco"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0.104"
|
||||
base64 = "0.23"
|
||||
clap = { version = "4.6.6", features = ["derive"] }
|
||||
flate2 = "1.1.9"
|
||||
walkdir = "2.5.0"
|
||||
cpio = "0.4.1"
|
||||
serde = { version = "1.0.229", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
xdg = "3.0.0"
|
||||
tempfile = "3.27.0"
|
||||
toml = "1.1.4"
|
||||
serde = { version = "1.0.229", features = ["derive"] }
|
||||
|
||||
[dev-dependencies]
|
||||
tempfile = "3.27.0"
|
||||
|
||||
@@ -1,20 +1,41 @@
|
||||
# slim
|
||||
# boco
|
||||
|
||||
Turning containers into bootable VMs
|
||||
Turn container images into bootable VMs
|
||||
|
||||
## Example - Minimal Alpine Busybox
|
||||
## Example
|
||||
|
||||
```Dockerfile
|
||||
# ./example/alpine/Containerfile
|
||||
FROM alpine:latest
|
||||
CMD ["/bin/sh"]
|
||||
```
|
||||
|
||||
```sh
|
||||
# Build the container
|
||||
podman build ./example/alpine -t slim-alpine
|
||||
podman build ./example/alpine -t boco-alpine
|
||||
|
||||
# Make the container bootable by extracing initrd (initial ramdisk)
|
||||
slim build qcow2 slim-alpine --init=/init
|
||||
# Make the container bootable. boco injects a custom init program,
|
||||
# then packs the rootfs as a qcow2 disk.
|
||||
boco build qcow2 boco-alpine
|
||||
|
||||
# Boot the image using QEMU, `./example/alpine/init` will drop you into an interactive shell.
|
||||
slim run slim-alpine
|
||||
# Boot the image using QEMU, and drop into /bin/sh.
|
||||
boco boot boco-alpine
|
||||
|
||||
# Cleanup
|
||||
slim image rm slim-alpine
|
||||
podman image rm slim-alpine
|
||||
boco image rm boco-alpine
|
||||
podman image rm boco-alpine
|
||||
```
|
||||
|
||||
Can also be used to boot a more traditional systemd-based VM:
|
||||
|
||||
```Dockerfile
|
||||
FROM archlinux:latest
|
||||
|
||||
# This works! Although you should probably add a user or some services.
|
||||
CMD ["/sbin/init"]
|
||||
```
|
||||
|
||||
## Kernel
|
||||
|
||||
boco boots VMs using a shared kernel at `$XDG_DATA_HOME/boco/registry/vmlinuz`.
|
||||
Place a suitable x86 bzImage there before running `boco boot`.
|
||||
|
||||
@@ -1,9 +1,2 @@
|
||||
FROM alpine:latest
|
||||
RUN mkdir -p /lib/apk/db /run
|
||||
RUN apk add --no-cache --initdb linux-virt busybox util-linux
|
||||
RUN cp /boot/vmlinuz-virt /vmlinuz && echo "Welcome to slim!" > /etc/motd
|
||||
|
||||
# Use custom init script
|
||||
COPY init /init
|
||||
RUN chmod +x /init
|
||||
|
||||
CMD ["/bin/sh"]
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Create console device
|
||||
# TODO: is this necessary?
|
||||
[ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
|
||||
|
||||
# Mount special filesystems
|
||||
mkdir -p /proc /sys
|
||||
mount -t proc proc /proc
|
||||
mount -t sysfs sysfs /sys
|
||||
|
||||
# Networking
|
||||
echo slim > /proc/sys/kernel/hostname
|
||||
ip link set lo up 2>/dev/null
|
||||
ip link set eth0 up 2>/dev/null
|
||||
udhcpc -i eth0 -f -q # Get DHCP lease
|
||||
|
||||
echo
|
||||
echo 'Welcome to slim!'
|
||||
echo
|
||||
|
||||
# Run interactive shell
|
||||
/bin/sh </dev/console >/dev/console 2>&1
|
||||
|
||||
poweroff -f
|
||||
while true; do
|
||||
sleep 1
|
||||
poweroff -f
|
||||
done
|
||||
@@ -1,23 +1,2 @@
|
||||
# FROM archlinux:latest
|
||||
FROM marvin
|
||||
|
||||
|
||||
USER root
|
||||
|
||||
# Update, install kernel, initramfs tools, and utilities
|
||||
# 'linux' includes mkinitcpio hooks that auto-generate the initramfs
|
||||
RUN pacman -Syu --noconfirm linux busybox util-linux dhcpcd; \
|
||||
pacman -Sc --noconfirm
|
||||
|
||||
# Copy kernel and initramfs to root for VM extraction
|
||||
RUN cp /boot/vmlinuz-linux /vmlinuz && \
|
||||
cp /boot/initramfs-linux.img /initrd.img
|
||||
|
||||
# Allow root login without password
|
||||
RUN passwd -d root
|
||||
|
||||
# Set up timezone. Required to bypass archlinux's first-install setup.
|
||||
RUN ln -s /usr/share/zoneinfo/Europe/Stockholm /etc/localtime
|
||||
|
||||
COPY init /init
|
||||
RUN chmod +x /init
|
||||
FROM archlinux:latest
|
||||
CMD ["/bin/sh"]
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Mount special filesystems
|
||||
mkdir -p /dev /proc /sys
|
||||
[ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
|
||||
mount -t proc proc /proc
|
||||
mount -t sysfs sysfs /sys
|
||||
|
||||
# Networking
|
||||
echo slim > /proc/sys/kernel/hostname
|
||||
ip link set lo up 2>/dev/null
|
||||
ip link set eth0 up 2>/dev/null
|
||||
# udhcpc -i eth0 -f -q # Get DHCP lease
|
||||
|
||||
echo
|
||||
echo 'Welcome to slim!'
|
||||
echo
|
||||
|
||||
# Start systemd
|
||||
exec /sbin/init
|
||||
|
||||
# Or, just run a shell
|
||||
# /bin/sh </dev/console >/dev/console 2>&1
|
||||
# poweroff -f
|
||||
# while true; do
|
||||
# sleep 1
|
||||
# poweroff -f
|
||||
# done
|
||||
Executable
+369
@@ -0,0 +1,369 @@
|
||||
#!/bin/bash
|
||||
# Test script for boco - boots containers and verifies CMD inference/override.
|
||||
# Requires: podman, qemu-system-x86_64, KVM, curl, and a kernel at
|
||||
# $XDG_DATA_HOME/boco/registry/vmlinuz.
|
||||
set -u
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
TARGET_DIR="${CARGO_TARGET_DIR:-$SCRIPT_DIR/../target}"
|
||||
BOCO_BIN="$TARGET_DIR/debug/boco"
|
||||
TIMEOUT=120
|
||||
|
||||
pass=0
|
||||
fail=0
|
||||
|
||||
report() {
|
||||
if [ "$1" = "pass" ]; then
|
||||
echo " PASS: $2"
|
||||
pass=$((pass + 1))
|
||||
else
|
||||
echo " FAIL: $2"
|
||||
fail=$((fail + 1))
|
||||
fi
|
||||
}
|
||||
|
||||
check_output() {
|
||||
output="$1"
|
||||
marker="$2"
|
||||
label="$3"
|
||||
if echo "$output" | grep -q "$marker"; then
|
||||
report pass "$label"
|
||||
else
|
||||
report fail "$label (expected marker: $marker)"
|
||||
fi
|
||||
}
|
||||
|
||||
cleanup() {
|
||||
"$BOCO_BIN" image rm "$1" >/dev/null 2>&1 || true
|
||||
podman image rm "$2" >/dev/null 2>&1 || true
|
||||
}
|
||||
|
||||
test_distro() {
|
||||
distro="$1"
|
||||
from="$2"
|
||||
extra_setup="$3"
|
||||
|
||||
echo "=== Testing $distro ==="
|
||||
|
||||
work="$(mktemp -d)"
|
||||
|
||||
# === Test 1: CMD-inferred ===
|
||||
echo "-- Test 1: CMD-inferred"
|
||||
cat > "$work/Containerfile.infer" <<EOF
|
||||
FROM $from
|
||||
$extra_setup
|
||||
CMD ["/bin/sh", "-c", "echo CMD_INFERRED_OK; wget -q -O /dev/null http://1.1.1.1 2>/dev/null && echo CONN_OK; wget -q -O /dev/null http://example.org 2>/dev/null && echo DNS_OK; poweroff -f"]
|
||||
EOF
|
||||
img="boco-test-$distro-infer"
|
||||
if podman build -t "$img" -f "$work/Containerfile.infer" >/dev/null 2>&1; then
|
||||
"$BOCO_BIN" build qcow2 "$img" >/dev/null 2>&1
|
||||
output=$(timeout "$TIMEOUT" "$BOCO_BIN" boot "$img" 2>&1 || true)
|
||||
check_output "$output" "CMD_INFERRED_OK" "$distro CMD-inferred"
|
||||
check_output "$output" "CONN_OK" "$distro connect to 1.1.1.1"
|
||||
check_output "$output" "DNS_OK" "$distro DNS lookup"
|
||||
else
|
||||
report fail "$distro CMD-inferred (podman build failed)"
|
||||
fi
|
||||
cleanup "$img" "$img"
|
||||
|
||||
# === Test 2: boco boot --cmd override ===
|
||||
echo "-- Test 2: boco boot --cmd override"
|
||||
cat > "$work/Containerfile.run" <<EOF
|
||||
FROM $from
|
||||
$extra_setup
|
||||
CMD ["/bin/sh", "-c", "echo SHOULD_NOT_APPEAR; poweroff -f"]
|
||||
EOF
|
||||
img="boco-test-$distro-run"
|
||||
if podman build -t "$img" -f "$work/Containerfile.run" >/dev/null 2>&1; then
|
||||
"$BOCO_BIN" build qcow2 "$img" >/dev/null 2>&1
|
||||
output=$(timeout "$TIMEOUT" "$BOCO_BIN" boot "$img" --cmd 'echo RUN_OVERRIDE_OK; poweroff -f' 2>&1 || true)
|
||||
check_output "$output" "RUN_OVERRIDE_OK" "$distro boot --cmd override"
|
||||
else
|
||||
report fail "$distro boot --cmd override (podman build failed)"
|
||||
fi
|
||||
cleanup "$img" "$img"
|
||||
|
||||
# === Test 3: boco build --cmd override ===
|
||||
echo "-- Test 3: boco build --cmd override"
|
||||
cat > "$work/Containerfile.build" <<EOF
|
||||
FROM $from
|
||||
$extra_setup
|
||||
CMD ["/bin/sh", "-c", "echo SHOULD_NOT_APPEAR; poweroff -f"]
|
||||
EOF
|
||||
img="boco-test-$distro-build"
|
||||
if podman build -t "$img" -f "$work/Containerfile.build" >/dev/null 2>&1; then
|
||||
"$BOCO_BIN" build qcow2 "$img" --cmd 'echo BUILD_OVERRIDE_OK; poweroff -f' >/dev/null 2>&1
|
||||
output=$(timeout "$TIMEOUT" "$BOCO_BIN" boot "$img" 2>&1 || true)
|
||||
check_output "$output" "BUILD_OVERRIDE_OK" "$distro build --cmd override"
|
||||
else
|
||||
report fail "$distro build --cmd override (podman build failed)"
|
||||
fi
|
||||
cleanup "$img" "$img"
|
||||
|
||||
rm -rf "$work"
|
||||
}
|
||||
|
||||
test_user() {
|
||||
echo "=== Testing USER directive ==="
|
||||
|
||||
work="$(mktemp -d)"
|
||||
img="boco-test-user"
|
||||
|
||||
cat > "$work/Containerfile" <<'EOF'
|
||||
FROM alpine:latest
|
||||
RUN adduser -D -u 1500 testuser
|
||||
USER testuser
|
||||
CMD ["/bin/sh", "-c", "echo USER_BUILD_OK:$(id -u):$(whoami); poweroff -f"]
|
||||
EOF
|
||||
|
||||
echo "-- Building container image with USER directive..."
|
||||
if ! podman build --network=none -t "$img" -f "$work/Containerfile" >/dev/null 2>&1; then
|
||||
report fail "USER directive (podman build failed)"
|
||||
rm -rf "$work"
|
||||
return
|
||||
fi
|
||||
|
||||
echo "-- Test 1: build-time CMD runs as USER"
|
||||
"$BOCO_BIN" build qcow2 "$img" >/dev/null 2>&1
|
||||
output=$(timeout "$TIMEOUT" "$BOCO_BIN" boot "$img" 2>&1 || true)
|
||||
check_output "$output" "USER_BUILD_OK:1500:testuser" "USER build-time CMD runs as testuser"
|
||||
|
||||
echo "-- Test 2: boot --cmd override runs as USER"
|
||||
output=$(timeout "$TIMEOUT" "$BOCO_BIN" boot "$img" --cmd 'echo USER_RUN_OK:$(id -u):$(whoami); poweroff -f' 2>&1 || true)
|
||||
check_output "$output" "USER_RUN_OK:1500:testuser" "USER boot --cmd override runs as testuser"
|
||||
|
||||
cleanup "$img" "$img"
|
||||
rm -rf "$work"
|
||||
}
|
||||
|
||||
test_mount() {
|
||||
echo "=== Testing --mount (9p shares) ==="
|
||||
|
||||
work="$(mktemp -d)"
|
||||
|
||||
# --- Image 1: no WORKINGDIR, test host:guest and multi-mount ---
|
||||
img="boco-test-mount"
|
||||
share_dir="$work/share"
|
||||
share_dir2="$work/share2"
|
||||
guest_dir="/mnt/guest"
|
||||
guest_dir2="/mnt/guest2"
|
||||
|
||||
mkdir -p "$share_dir" "$share_dir2"
|
||||
echo "hello from host" > "$share_dir/testfile.txt"
|
||||
echo "second share" > "$share_dir2/testfile2.txt"
|
||||
|
||||
cat > "$work/Containerfile" <<'EOF'
|
||||
FROM alpine:latest
|
||||
CMD ["/bin/sh", "-c", "poweroff -f"]
|
||||
EOF
|
||||
|
||||
echo "-- Building container image (no WORKINGDIR)..."
|
||||
if ! podman build --network=none -t "$img" -f "$work/Containerfile" >/dev/null 2>&1; then
|
||||
report fail "--mount (podman build failed)"
|
||||
rm -rf "$work"
|
||||
return
|
||||
fi
|
||||
|
||||
echo "-- Building boco VM..."
|
||||
if ! "$BOCO_BIN" build qcow2 "$img" >/dev/null 2>&1; then
|
||||
report fail "--mount (boco build failed)"
|
||||
cleanup "$img" "$img"
|
||||
rm -rf "$work"
|
||||
return
|
||||
fi
|
||||
|
||||
share_canon=$(readlink -f "$share_dir")
|
||||
share_canon2=$(readlink -f "$share_dir2")
|
||||
|
||||
echo "-- Test 1: --mount host:guest (absolute guest path, multi-mount)..."
|
||||
output=$(timeout "$TIMEOUT" "$BOCO_BIN" boot "$img" \
|
||||
--mount "${share_dir}:${guest_dir}" \
|
||||
--mount "${share_dir2}:${guest_dir2}" \
|
||||
--cmd "for f in /sys/bus/virtio/drivers/9pnet_virtio/virtio*/mount_tag; do [ -f \"\$f\" ] && echo \"\$f: \$(tr -d '\\0' < \"\$f\")\"; done; mount -v; cat ${guest_dir}/testfile.txt 2>/dev/null || echo NO_FILE; cat ${guest_dir2}/testfile2.txt 2>/dev/null || echo NO_FILE2; echo MOUNT_VERIFY_DONE; poweroff -f" \
|
||||
2>&1 || true)
|
||||
|
||||
check_output "$output" "mount_tag: boco0" "--mount 9p share detected"
|
||||
check_output "$output" "mount_tag: boco1" "--mount second 9p share detected"
|
||||
check_output "$output" "type 9p" "--mount 9p filesystem in mount list"
|
||||
check_output "$output" "hello from host" "--mount file accessible at guest path"
|
||||
check_output "$output" "second share" "--mount second file accessible at guest path"
|
||||
check_output "$output" "MOUNT_VERIFY_DONE" "--mount VM ran to completion"
|
||||
|
||||
cleanup "$img" "$img"
|
||||
|
||||
# --- Image 2: with WORKINGDIR, test relative guest path ---
|
||||
img="boco-test-mount-wd"
|
||||
share_dir3="$work/share3"
|
||||
|
||||
mkdir -p "$share_dir3"
|
||||
echo "relative share" > "$share_dir3/relfile.txt"
|
||||
|
||||
cat > "$work/Containerfile.wd" <<'EOF'
|
||||
FROM alpine:latest
|
||||
WORKDIR /app
|
||||
CMD ["/bin/sh", "-c", "poweroff -f"]
|
||||
EOF
|
||||
|
||||
echo "-- Building container image (WORKINGDIR /app)..."
|
||||
if ! podman build --network=none -t "$img" -f "$work/Containerfile.wd" >/dev/null 2>&1; then
|
||||
report fail "--mount relative (podman build failed)"
|
||||
rm -rf "$work"
|
||||
return
|
||||
fi
|
||||
|
||||
echo "-- Building boco VM..."
|
||||
if ! "$BOCO_BIN" build qcow2 "$img" >/dev/null 2>&1; then
|
||||
report fail "--mount relative (boco build failed)"
|
||||
cleanup "$img" "$img"
|
||||
rm -rf "$work"
|
||||
return
|
||||
fi
|
||||
|
||||
echo "-- Test 2: --mount host:relative-guest (resolved against WORKINGDIR)..."
|
||||
output=$(timeout "$TIMEOUT" "$BOCO_BIN" boot "$img" \
|
||||
--mount "${share_dir3}:data" \
|
||||
--cmd "mount -v; cat /app/data/relfile.txt 2>/dev/null || echo NO_REL_FILE; echo REL_VERIFY_DONE; poweroff -f" \
|
||||
2>&1 || true)
|
||||
|
||||
check_output "$output" "type 9p" "--mount relative 9p filesystem in mount list"
|
||||
check_output "$output" "relative share" "--mount relative file accessible at WORKINGDIR/data"
|
||||
check_output "$output" "REL_VERIFY_DONE" "--mount relative VM ran to completion"
|
||||
|
||||
cleanup "$img" "$img"
|
||||
rm -rf "$work"
|
||||
}
|
||||
|
||||
test_service() {
|
||||
echo "=== Testing nextcloud service ==="
|
||||
|
||||
img="boco-test-nextcloud"
|
||||
host_port=18080
|
||||
work="$(mktemp -d)"
|
||||
|
||||
cat > "$work/Containerfile" <<'EOF'
|
||||
FROM docker.io/library/nextcloud:32-apache
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends iproute2 && rm -rf /var/lib/apt/lists/*
|
||||
EOF
|
||||
|
||||
echo "-- Building nextcloud container image..."
|
||||
if ! podman build -t "$img" -f "$work/Containerfile" >/dev/null 2>&1; then
|
||||
report fail "nextcloud service (podman build failed)"
|
||||
rm -rf "$work"
|
||||
return
|
||||
fi
|
||||
|
||||
echo "-- Building boco VM..."
|
||||
if ! "$BOCO_BIN" build qcow2 "$img" >/dev/null 2>&1; then
|
||||
report fail "nextcloud service (boco build failed)"
|
||||
cleanup "$img" "$img"
|
||||
rm -rf "$work"
|
||||
return
|
||||
fi
|
||||
|
||||
echo "-- Booting VM with port forward (host :${host_port} -> guest :80)..."
|
||||
setsid timeout 300 "$BOCO_BIN" boot "$img" \
|
||||
--forward "tcp:0.0.0.0:${host_port}-:80" \
|
||||
--memory 2048M >/dev/null 2>&1 &
|
||||
vm_pid=$!
|
||||
|
||||
echo "-- Waiting for Nextcloud to start..."
|
||||
up=0
|
||||
for _ in $(seq 1 60); do
|
||||
if curl -s -o /dev/null -m 2 "http://localhost:${host_port}/" 2>/dev/null; then
|
||||
up=1
|
||||
break
|
||||
fi
|
||||
sleep 3
|
||||
done
|
||||
|
||||
if [ "$up" = "1" ]; then
|
||||
response=$(curl -s -L -m 10 "http://localhost:${host_port}/" 2>/dev/null || true)
|
||||
if echo "$response" | grep -qi "nextcloud"; then
|
||||
report pass "nextcloud service (port forward + content)"
|
||||
else
|
||||
report fail "nextcloud service (port reachable but no 'nextcloud' in response)"
|
||||
fi
|
||||
else
|
||||
report fail "nextcloud service (port not reachable within timeout)"
|
||||
fi
|
||||
|
||||
pkill -f "qemu-system-x86_64.*$img" 2>/dev/null || true
|
||||
kill "$vm_pid" 2>/dev/null || true
|
||||
wait "$vm_pid" 2>/dev/null || true
|
||||
|
||||
cleanup "$img" "$img"
|
||||
rm -rf "$work"
|
||||
}
|
||||
|
||||
test_systemd() {
|
||||
echo "=== Testing systemd as init ==="
|
||||
|
||||
work="$(mktemp -d)"
|
||||
img="boco-test-systemd"
|
||||
|
||||
cat > "$work/boco-test.service" <<'SVC'
|
||||
[Unit]
|
||||
Description=boco systemd test
|
||||
After=multi-user.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/bin/sh -c "echo SYSTEMD_TEST_OK > /dev/console; sleep 1; systemctl poweroff"
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
SVC
|
||||
|
||||
cat > "$work/Containerfile" <<EOF
|
||||
FROM archlinux:latest
|
||||
COPY boco-test.service /etc/systemd/system/boco-test.service
|
||||
RUN mkdir -p /etc/systemd/system/multi-user.target.wants && \
|
||||
ln -sf /etc/systemd/system/boco-test.service \
|
||||
/etc/systemd/system/multi-user.target.wants/boco-test.service
|
||||
CMD ["/sbin/init"]
|
||||
EOF
|
||||
|
||||
echo "-- Building container image with systemd..."
|
||||
if ! podman build -t "$img" "$work" >/dev/null 2>&1; then
|
||||
report fail "systemd as init (podman build failed)"
|
||||
rm -rf "$work"
|
||||
return
|
||||
fi
|
||||
|
||||
echo "-- Building boco VM..."
|
||||
if ! "$BOCO_BIN" build qcow2 "$img" >/dev/null 2>&1; then
|
||||
report fail "systemd as init (boco build failed)"
|
||||
cleanup "$img" "$img"
|
||||
rm -rf "$work"
|
||||
return
|
||||
fi
|
||||
|
||||
echo "-- Booting VM (systemd as PID 1)..."
|
||||
output=$(timeout "$TIMEOUT" "$BOCO_BIN" boot "$img" 2>&1 || true)
|
||||
check_output "$output" "SYSTEMD_TEST_OK" "systemd boots and runs service"
|
||||
check_output "$output" "reboot: Power down" "systemd shuts down cleanly"
|
||||
|
||||
cleanup "$img" "$img"
|
||||
rm -rf "$work"
|
||||
}
|
||||
|
||||
echo "Building boco..."
|
||||
cargo build 2>&1
|
||||
cargo build --release -p boco-init --target x86_64-unknown-linux-musl 2>&1
|
||||
cp "$TARGET_DIR/x86_64-unknown-linux-musl/release/boco-init" \
|
||||
"${XDG_DATA_HOME:-$HOME/.local/share}/boco/boco-init"
|
||||
|
||||
test_distro "alpine" "alpine:latest" ""
|
||||
test_distro "archlinux" "archlinux:latest" "RUN pacman -Sy --noconfirm iproute2 wget; pacman -Sc --noconfirm"
|
||||
|
||||
test_user
|
||||
|
||||
test_mount
|
||||
|
||||
test_service
|
||||
|
||||
test_systemd
|
||||
|
||||
echo ""
|
||||
echo "=== Results: $pass passed, $fail failed ==="
|
||||
[ "$fail" -eq 0 ]
|
||||
@@ -0,0 +1,8 @@
|
||||
[package]
|
||||
name = "boco-init"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
base64 = "0.23"
|
||||
nix = { version = "0.31", features = ["mount", "fs", "process", "user", "reboot"] }
|
||||
@@ -0,0 +1,429 @@
|
||||
//! boco universal init.
|
||||
//!
|
||||
//! Injected by `boco build` at /boco/init and invoked via init=/boco/init.
|
||||
//! Sets up devices, filesystems, networking, and 9p shares, then execs the
|
||||
//! container's CMD/ENTRYPOINT (or a runtime override) with execvp so the
|
||||
//! command becomes PID 1 directly.
|
||||
|
||||
use base64::Engine;
|
||||
use nix::mount::{MsFlags, mount};
|
||||
use nix::sys::reboot::{RebootMode, reboot};
|
||||
use nix::sys::stat::{Mode, SFlag, makedev, mknod};
|
||||
use nix::sys::wait::waitpid;
|
||||
use nix::unistd::{ForkResult, Gid, Uid, User, execvp, fork, setgid, setuid};
|
||||
use std::env;
|
||||
use std::ffi::CString;
|
||||
use std::fs;
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
use std::path::Path;
|
||||
use std::process::Command;
|
||||
|
||||
fn warn(msg: &str) {
|
||||
eprintln!("boco-init: {msg}");
|
||||
}
|
||||
|
||||
/// Run a fallible operation, logging on error.
|
||||
fn try_io<F, T>(label: &str, f: F)
|
||||
where
|
||||
F: FnOnce() -> std::io::Result<T>,
|
||||
{
|
||||
if let Err(e) = f() {
|
||||
warn(&format!("{label}: {e}"));
|
||||
}
|
||||
}
|
||||
|
||||
/// Run a command, logging on error or non-zero exit.
|
||||
fn try_cmd(label: &str, cmd: &mut Command) {
|
||||
match cmd.status() {
|
||||
Ok(status) => {
|
||||
if !status.success() {
|
||||
warn(&format!("{label}: exited with {status}"));
|
||||
}
|
||||
}
|
||||
Err(e) => warn(&format!("{label}: {e}")),
|
||||
}
|
||||
}
|
||||
|
||||
/// The kernel passes a minimal environment to init. Set a default PATH
|
||||
/// so that `ip` and other tools can be found by name.
|
||||
fn ensure_path() {
|
||||
if env::var("PATH").is_err() {
|
||||
// SAFETY: we are single-threaded before fork/exec.
|
||||
unsafe {
|
||||
env::set_var(
|
||||
"PATH",
|
||||
"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn find_in_path(prog: &str) -> Option<String> {
|
||||
let path = env::var("PATH").ok()?;
|
||||
for dir in path.split(':') {
|
||||
let candidate = format!("{dir}/{prog}");
|
||||
if Path::new(&candidate).exists() {
|
||||
return Some(candidate);
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
fn try_mount(
|
||||
source: Option<&str>,
|
||||
target: &str,
|
||||
fstype: Option<&str>,
|
||||
flags: MsFlags,
|
||||
data: Option<&str>,
|
||||
) {
|
||||
if let Err(e) = mount(source, target, fstype, flags, data) {
|
||||
warn(&format!("mount {target}: {e}"));
|
||||
}
|
||||
}
|
||||
|
||||
fn setup_filesystems() {
|
||||
if !Path::new("/dev/console").exists() {
|
||||
try_io("mknod /dev/console", || {
|
||||
mknod(
|
||||
"/dev/console",
|
||||
SFlag::S_IFCHR,
|
||||
Mode::S_IRUSR | Mode::S_IWUSR,
|
||||
makedev(5, 1),
|
||||
)
|
||||
.map_err(std::io::Error::from)
|
||||
});
|
||||
}
|
||||
|
||||
let dirs = [
|
||||
"/proc",
|
||||
"/sys",
|
||||
"/dev/pts",
|
||||
"/dev/shm",
|
||||
"/run",
|
||||
"/tmp",
|
||||
"/sys/fs/cgroup",
|
||||
];
|
||||
for d in &dirs {
|
||||
try_io(&format!("mkdir {d}"), || fs::create_dir_all(d));
|
||||
}
|
||||
|
||||
try_mount(Some("proc"), "/proc", Some("proc"), MsFlags::empty(), None);
|
||||
try_mount(Some("sysfs"), "/sys", Some("sysfs"), MsFlags::empty(), None);
|
||||
try_mount(
|
||||
Some("devpts"),
|
||||
"/dev/pts",
|
||||
Some("devpts"),
|
||||
MsFlags::empty(),
|
||||
None,
|
||||
);
|
||||
try_mount(
|
||||
Some("tmpfs"),
|
||||
"/dev/shm",
|
||||
Some("tmpfs"),
|
||||
MsFlags::empty(),
|
||||
None,
|
||||
);
|
||||
try_mount(
|
||||
Some("tmpfs"),
|
||||
"/run",
|
||||
Some("tmpfs"),
|
||||
MsFlags::empty(),
|
||||
Some("mode=755"),
|
||||
);
|
||||
try_mount(
|
||||
Some("tmpfs"),
|
||||
"/tmp",
|
||||
Some("tmpfs"),
|
||||
MsFlags::empty(),
|
||||
Some("mode=1777"),
|
||||
);
|
||||
|
||||
// cgroup2
|
||||
try_mount(
|
||||
Some("cgroup2"),
|
||||
"/sys/fs/cgroup",
|
||||
Some("cgroup2"),
|
||||
MsFlags::empty(),
|
||||
None,
|
||||
);
|
||||
if let Ok(controllers) = fs::read_to_string("/sys/fs/cgroup/cgroup.controllers") {
|
||||
for c in controllers.split_whitespace() {
|
||||
try_io("write cgroup.subtree_control", || {
|
||||
fs::write("/sys/fs/cgroup/cgroup.subtree_control", format!("+{c}"))
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn setup_rootless_prereqs() {
|
||||
// make-rshared /
|
||||
if let Err(e) =
|
||||
mount::<str, str, str, str>(None, "/", None, MsFlags::MS_REC | MsFlags::MS_SHARED, None)
|
||||
{
|
||||
warn(&format!("make-rshared /: {e}"));
|
||||
}
|
||||
|
||||
// chmod u+s newuidmap newgidmap
|
||||
for bin in &["/usr/bin/newuidmap", "/usr/bin/newgidmap"] {
|
||||
match fs::metadata(bin) {
|
||||
Ok(meta) => {
|
||||
let mut perms = meta.permissions();
|
||||
perms.set_mode(perms.mode() | 0o4000);
|
||||
try_io(&format!("chmod u+s {bin}"), || {
|
||||
fs::set_permissions(bin, perms)
|
||||
});
|
||||
}
|
||||
Err(e) if e.kind() == std::io::ErrorKind::NotFound => {}
|
||||
Err(e) => warn(&format!("stat {bin}: {e}")),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn setup_timezone() {
|
||||
try_io("symlink timezone", || {
|
||||
std::os::unix::fs::symlink("/usr/share/zoneinfo/Europe/Stockholm", "/etc/localtime")
|
||||
});
|
||||
}
|
||||
|
||||
fn setup_networking() {
|
||||
let ip = find_in_path("ip").unwrap_or_else(|| "/sbin/ip".to_string());
|
||||
try_cmd(
|
||||
"ip link set lo up",
|
||||
Command::new(&ip).args(["link", "set", "lo", "up"]),
|
||||
);
|
||||
try_cmd(
|
||||
"ip link set eth0 up",
|
||||
Command::new(&ip).args(["link", "set", "eth0", "up"]),
|
||||
);
|
||||
try_cmd(
|
||||
"ip addr add 10.0.2.15/24 dev eth0",
|
||||
Command::new(&ip).args(["addr", "add", "10.0.2.15/24", "dev", "eth0"]),
|
||||
);
|
||||
try_cmd(
|
||||
"ip route add default via 10.0.2.2",
|
||||
Command::new(&ip).args(["route", "add", "default", "via", "10.0.2.2"]),
|
||||
);
|
||||
try_io("write /etc/resolv.conf", || {
|
||||
fs::write("/etc/resolv.conf", "nameserver 10.0.2.3\n")
|
||||
});
|
||||
}
|
||||
|
||||
fn setup_9p_shares(workdir: &str) {
|
||||
let cmdline = match fs::read_to_string("/proc/cmdline") {
|
||||
Ok(c) => c,
|
||||
Err(e) => {
|
||||
warn(&format!("read /proc/cmdline: {e}"));
|
||||
return;
|
||||
}
|
||||
};
|
||||
let b64 = base64::engine::general_purpose::STANDARD;
|
||||
|
||||
for tok in cmdline.split_whitespace() {
|
||||
if let Some(rest) = tok.strip_prefix("boco.mount=") {
|
||||
let Some((tag, dest_b64)) = rest.split_once(':') else {
|
||||
continue;
|
||||
};
|
||||
let dest = match b64.decode(dest_b64) {
|
||||
Ok(bytes) => match String::from_utf8(bytes) {
|
||||
Ok(s) => s,
|
||||
Err(e) => {
|
||||
warn(&format!("9p: invalid UTF-8 in guest path: {e}"));
|
||||
continue;
|
||||
}
|
||||
},
|
||||
Err(e) => {
|
||||
warn(&format!("9p: base64 decode failed: {e}"));
|
||||
continue;
|
||||
}
|
||||
};
|
||||
|
||||
// Resolve relative guest paths against WORKINGDIR
|
||||
let dest = if dest.starts_with('/') {
|
||||
dest
|
||||
} else {
|
||||
format!("{}/{}", workdir, dest)
|
||||
};
|
||||
|
||||
try_io(&format!("mkdir {dest}"), || fs::create_dir_all(&dest));
|
||||
try_mount(
|
||||
Some(tag),
|
||||
&dest,
|
||||
Some("9p"),
|
||||
MsFlags::empty(),
|
||||
Some("trans=virtio,version=9p2000.L"),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn read_file_opt(path: &str) -> Option<String> {
|
||||
fs::read_to_string(path)
|
||||
.ok()
|
||||
.filter(|s| !s.trim().is_empty())
|
||||
}
|
||||
|
||||
fn split_null_delimited(data: &[u8]) -> Vec<String> {
|
||||
data.split(|&b| b == 0)
|
||||
.filter(|s| !s.is_empty())
|
||||
.map(|s| String::from_utf8_lossy(s).into_owned())
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn read_argv() -> Vec<String> {
|
||||
// Check for runtime override: boco.cmd=<base64(null-delimited argv)>
|
||||
let b64 = base64::engine::general_purpose::STANDARD;
|
||||
if let Ok(cmdline) = fs::read_to_string("/proc/cmdline") {
|
||||
for tok in cmdline.split_whitespace() {
|
||||
if let Some(rest) = tok.strip_prefix("boco.cmd=")
|
||||
&& let Ok(decoded) = b64.decode(rest)
|
||||
{
|
||||
let argv = split_null_delimited(&decoded);
|
||||
if !argv.is_empty() {
|
||||
return argv;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Fall back to build-time argv from /boco/exec
|
||||
match fs::read("/boco/exec") {
|
||||
Ok(data) => {
|
||||
let argv = split_null_delimited(&data);
|
||||
if !argv.is_empty() {
|
||||
return argv;
|
||||
}
|
||||
}
|
||||
Err(e) => warn(&format!("read /boco/exec: {e}")),
|
||||
}
|
||||
|
||||
warn("no command found, falling back to /bin/sh");
|
||||
vec!["/bin/sh".to_string()]
|
||||
}
|
||||
|
||||
fn apply_env() {
|
||||
if let Ok(data) = fs::read("/boco/env") {
|
||||
for entry in split_null_delimited(&data) {
|
||||
if let Some((key, val)) = entry.split_once('=') {
|
||||
// SAFETY: we are single-threaded before fork/exec.
|
||||
unsafe { env::set_var(key, val) };
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn apply_workdir() {
|
||||
if let Some(dir) = read_file_opt("/boco/workdir") {
|
||||
try_io("set working directory", || env::set_current_dir(&dir));
|
||||
}
|
||||
}
|
||||
|
||||
struct UserSpec {
|
||||
uid: Uid,
|
||||
gid: Gid,
|
||||
}
|
||||
|
||||
fn resolve_user(spec: &str) -> Option<UserSpec> {
|
||||
let (user_part, gid_part) = match spec.split_once(':') {
|
||||
Some((u, g)) => (u, Some(g)),
|
||||
None => (spec, None),
|
||||
};
|
||||
|
||||
let (uid, default_gid) = if let Ok(numeric) = user_part.parse::<u32>() {
|
||||
let user = User::from_uid(Uid::from_raw(numeric)).ok().flatten();
|
||||
let gid = user
|
||||
.as_ref()
|
||||
.map(|u| u.gid)
|
||||
.unwrap_or(Gid::from_raw(numeric));
|
||||
(Uid::from_raw(numeric), gid)
|
||||
} else {
|
||||
let user = User::from_name(user_part).ok().flatten()?;
|
||||
(user.uid, user.gid)
|
||||
};
|
||||
|
||||
let gid = match gid_part {
|
||||
Some(g) => match g.parse::<u32>() {
|
||||
Ok(n) => Gid::from_raw(n),
|
||||
Err(_) => default_gid,
|
||||
},
|
||||
None => default_gid,
|
||||
};
|
||||
|
||||
Some(UserSpec { uid, gid })
|
||||
}
|
||||
|
||||
fn exec_command(argv: &[String], user: Option<UserSpec>) -> ! {
|
||||
let cstrings: Vec<CString> = argv
|
||||
.iter()
|
||||
.map(|s| CString::new(s.as_str()).unwrap_or_default())
|
||||
.collect();
|
||||
let c_prog = cstrings[0].clone();
|
||||
let c_refs: Vec<&CString> = cstrings.iter().collect();
|
||||
|
||||
match user {
|
||||
None => {
|
||||
// No privilege drop: exec directly, PID 1 becomes the command.
|
||||
let Err(e) = execvp(&c_prog, &c_refs);
|
||||
warn(&format!("execvp {}: {e}", argv[0]));
|
||||
let _ = reboot(RebootMode::RB_POWER_OFF);
|
||||
std::process::exit(1);
|
||||
}
|
||||
Some(user) => {
|
||||
// Drop privileges in a child so PID 1 (root) can poweroff afterwards.
|
||||
match unsafe { fork() } {
|
||||
Ok(ForkResult::Child) => {
|
||||
// setgid before setuid to avoid losing privileges
|
||||
if let Err(e) = setgid(user.gid) {
|
||||
warn(&format!("setgid: {e}"));
|
||||
}
|
||||
if let Err(e) = setuid(user.uid) {
|
||||
warn(&format!("setuid: {e}"));
|
||||
}
|
||||
let Err(e) = execvp(&c_prog, &c_refs);
|
||||
warn(&format!("execvp {}: {e}", argv[0]));
|
||||
std::process::exit(127);
|
||||
}
|
||||
Ok(ForkResult::Parent { child }) => {
|
||||
let _ = waitpid(child, None);
|
||||
let _ = reboot(RebootMode::RB_POWER_OFF);
|
||||
std::process::exit(0);
|
||||
}
|
||||
Err(e) => {
|
||||
warn(&format!("fork: {e}"));
|
||||
let _ = reboot(RebootMode::RB_POWER_OFF);
|
||||
std::process::exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {
|
||||
ensure_path();
|
||||
|
||||
// === Devices & special filesystems ===
|
||||
setup_filesystems();
|
||||
|
||||
// === Rootless container prerequisites (best-effort) ===
|
||||
setup_rootless_prereqs();
|
||||
|
||||
// === Timezone ===
|
||||
setup_timezone();
|
||||
|
||||
// === Networking ===
|
||||
setup_networking();
|
||||
|
||||
// === 9p shares ===
|
||||
let workdir = read_file_opt("/boco/workdir").unwrap_or_default();
|
||||
setup_9p_shares(&workdir);
|
||||
|
||||
// === Environment & working directory ===
|
||||
apply_env();
|
||||
apply_workdir();
|
||||
|
||||
// === Resolve user for privilege drop ===
|
||||
let user = read_file_opt("/boco/user").and_then(|spec| resolve_user(&spec));
|
||||
|
||||
// === Execute the configured command ===
|
||||
let argv = read_argv();
|
||||
exec_command(&argv, user);
|
||||
}
|
||||
+4081
File diff suppressed because it is too large
Load Diff
Submodule
+1
Submodule kernel/linux added at 8d3ae59288
+73
-29
@@ -1,5 +1,5 @@
|
||||
//! Build: mount a podman image, extract vmlinuz, and pack the rootfs as a
|
||||
//! gzipped cpio initrd in the registry.
|
||||
//! Build: mount a podman image, inject /boco/ scripts, and pack the rootfs
|
||||
//! as a gzipped cpio initrd or qcow2 disk in the registry.
|
||||
|
||||
use anyhow::{Context, Result, bail};
|
||||
use clap::{Args, ValueEnum};
|
||||
@@ -11,7 +11,7 @@ use std::process::{Command, Stdio};
|
||||
use tempfile::NamedTempFile;
|
||||
|
||||
use crate::command::cmd;
|
||||
use crate::meta::Meta;
|
||||
use crate::inject;
|
||||
use crate::registry::registry_dir;
|
||||
|
||||
#[derive(Args, Debug)]
|
||||
@@ -21,10 +21,10 @@ pub struct BuildCmd {
|
||||
/// Image tag / registry subdir name
|
||||
name: String,
|
||||
|
||||
/// The path to the `init` program for the VM.
|
||||
// TODO: infer init based on `COMMAND`/`ENTRYPOINT`?
|
||||
#[clap(long, default_value = "/sbin/init")]
|
||||
init: String,
|
||||
/// Override the command to exec in the VM. Inferred from the image's
|
||||
/// CMD/ENTRYPOINT if not provided.
|
||||
#[clap(long)]
|
||||
cmd: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(ValueEnum, Clone, Debug)]
|
||||
@@ -33,39 +33,83 @@ enum ImageKind {
|
||||
Initrd,
|
||||
}
|
||||
|
||||
pub(crate) fn build(BuildCmd { kind, name, init }: BuildCmd) -> Result<()> {
|
||||
pub(crate) fn build(
|
||||
BuildCmd {
|
||||
kind,
|
||||
name,
|
||||
cmd: cmd_override,
|
||||
}: BuildCmd,
|
||||
) -> Result<()> {
|
||||
let image = &name;
|
||||
let mount_path = mount_image(image)?;
|
||||
let container = format!("boco-build-{}", image.replace(':', "-"));
|
||||
|
||||
let mount_path = mount_container(image, &container)?;
|
||||
println!("Mounted at: {}", mount_path.display());
|
||||
|
||||
// Keep the build result so the image is unmounted even when the build fails.
|
||||
let result = match kind {
|
||||
ImageKind::Initrd => build_initrd(image, &mount_path),
|
||||
ImageKind::Qcow2 => build_qcow2(image, &mount_path),
|
||||
};
|
||||
let result = build_inner(&kind, image, &mount_path, cmd_override);
|
||||
|
||||
let unmounted = cmd(&[
|
||||
"podman", "unshare", "--", "podman", "image", "unmount", image,
|
||||
"podman",
|
||||
"unshare",
|
||||
"--",
|
||||
"podman",
|
||||
"container",
|
||||
"unmount",
|
||||
&container,
|
||||
])
|
||||
.is_ok();
|
||||
if unmounted {
|
||||
println!("Unmounted image.");
|
||||
let removed = cmd(&["podman", "rm", &container]).is_ok();
|
||||
if unmounted && removed {
|
||||
println!("Unmounted and removed container.");
|
||||
} else {
|
||||
eprintln!("warning: failed to unmount image '{}'", image);
|
||||
eprintln!("warning: failed to clean up container '{container}'");
|
||||
}
|
||||
|
||||
Meta { init }.save(image)?;
|
||||
|
||||
result
|
||||
}
|
||||
|
||||
fn mount_image(image: &str) -> Result<PathBuf> {
|
||||
let mount_path = cmd(&["podman", "unshare", "--", "podman", "image", "mount", image])?;
|
||||
fn build_inner(
|
||||
kind: &ImageKind,
|
||||
image: &str,
|
||||
mount_path: &Path,
|
||||
cmd: Option<String>,
|
||||
) -> Result<()> {
|
||||
let config = inject::inspect_config(image)?;
|
||||
let argv = match cmd {
|
||||
Some(s) => vec!["/bin/sh".into(), "-c".into(), s],
|
||||
None => inject::infer_argv(&config),
|
||||
};
|
||||
inject::inject(
|
||||
mount_path,
|
||||
&argv,
|
||||
&config.env,
|
||||
config.user.as_deref(),
|
||||
config.working_dir.as_deref(),
|
||||
)?;
|
||||
println!("Injected /boco/ (init + exec)");
|
||||
|
||||
match kind {
|
||||
ImageKind::Initrd => build_initrd(image, mount_path),
|
||||
ImageKind::Qcow2 => build_qcow2(image, mount_path),
|
||||
}
|
||||
}
|
||||
|
||||
fn mount_container(image: &str, container: &str) -> Result<PathBuf> {
|
||||
cmd(&["podman", "create", "--name", container, image, "/bin/true"])?;
|
||||
let mount_path = cmd(&[
|
||||
"podman",
|
||||
"unshare",
|
||||
"--",
|
||||
"podman",
|
||||
"container",
|
||||
"mount",
|
||||
container,
|
||||
])?;
|
||||
Ok(PathBuf::from(mount_path.trim()))
|
||||
}
|
||||
|
||||
/// Copy a directory onto a new raw disk image with EXT4.
|
||||
fn to_raw_ext4(dir: &Path) -> Result<NamedTempFile> {
|
||||
fn to_raw_ext4(dir: &Path, tmp_dir: &Path) -> Result<NamedTempFile> {
|
||||
let dir = dir.to_str().context("Invalid UTF-8")?;
|
||||
let du_out = cmd(&["podman", "unshare", "--", "du", "-sk", dir])?;
|
||||
|
||||
@@ -83,7 +127,7 @@ fn to_raw_ext4(dir: &Path) -> Result<NamedTempFile> {
|
||||
+ 64 * gb; // Add some spare capacity for activities
|
||||
let size = size.to_string();
|
||||
|
||||
let raw_file = NamedTempFile::new()?;
|
||||
let raw_file = NamedTempFile::new_in(tmp_dir)?;
|
||||
let raw_path = raw_file.path().to_str().context("Invalid UTF-8")?;
|
||||
cmd(&["podman", "unshare", "--", "truncate", "-s", &size, raw_path])?;
|
||||
cmd(&[
|
||||
@@ -100,9 +144,9 @@ fn to_raw_ext4(dir: &Path) -> Result<NamedTempFile> {
|
||||
}
|
||||
|
||||
/// Copy a directory onto a new qcow2 disk image with EXT4.
|
||||
fn to_qcow2_ext4(mount_path: &Path) -> Result<NamedTempFile> {
|
||||
let raw = to_raw_ext4(mount_path)?;
|
||||
let qcow2 = NamedTempFile::new()?;
|
||||
fn to_qcow2_ext4(mount_path: &Path, tmp_dir: &Path) -> Result<NamedTempFile> {
|
||||
let raw = to_raw_ext4(mount_path, tmp_dir)?;
|
||||
let qcow2 = NamedTempFile::new_in(tmp_dir)?;
|
||||
let raw_path = raw.path().to_str().context("Invalid UTF-8")?;
|
||||
let qcow2_path = qcow2.path().to_str().context("Invalid UTF-8")?;
|
||||
cmd(&[
|
||||
@@ -116,7 +160,7 @@ fn build_qcow2(image: &str, mount_path: &Path) -> Result<()> {
|
||||
fs::create_dir_all(®_dir)?;
|
||||
println!("Registry: {}", reg_dir.display());
|
||||
|
||||
let qcow2 = to_qcow2_ext4(mount_path)?;
|
||||
let qcow2 = to_qcow2_ext4(mount_path, ®_dir)?;
|
||||
|
||||
fs::copy(qcow2.path(), reg_dir.join("image.qcow2"))
|
||||
.context("Failed to copy qcow2 image to registry")?;
|
||||
@@ -134,7 +178,7 @@ fn build_initrd(image: &str, mount_path: &Path) -> Result<()> {
|
||||
// Pack the rootfs as a gzipped newc cpio archive. The cpio pipeline
|
||||
// runs inside the namespace, its stdout is compressed here.
|
||||
let initrd_path = reg_dir.join("initrd");
|
||||
let script = r#"cd "$1" && find . -not -path ./vmlinuz | cpio -o -H newc"#;
|
||||
let script = r#"cd "$1" && find . | cpio -o -H newc"#;
|
||||
let mut cpio = Command::new("podman")
|
||||
.args(["unshare", "--", "sh", "-c", script, "sh", mount_path])
|
||||
.stdout(Stdio::piped())
|
||||
|
||||
+115
@@ -0,0 +1,115 @@
|
||||
//! Inject: inspect a podman image's config, infer the default command argv,
|
||||
//! and inject the boco init binary + null-delimited argv/env files into the
|
||||
//! mounted rootfs.
|
||||
|
||||
use anyhow::{Context, Result, anyhow};
|
||||
use serde::Deserialize;
|
||||
use std::fs;
|
||||
use std::path::Path;
|
||||
|
||||
use crate::command::cmd;
|
||||
use crate::registry::init_binary_path;
|
||||
|
||||
#[derive(Debug, Default, Deserialize)]
|
||||
#[serde(rename_all = "PascalCase")]
|
||||
pub struct Config {
|
||||
#[serde(default)]
|
||||
pub cmd: Vec<String>,
|
||||
#[serde(default)]
|
||||
pub entrypoint: Vec<String>,
|
||||
#[serde(default)]
|
||||
pub env: Vec<String>,
|
||||
#[serde(default)]
|
||||
pub working_dir: Option<String>,
|
||||
#[serde(default)]
|
||||
pub user: Option<String>,
|
||||
}
|
||||
|
||||
pub fn inspect_config(image: &str) -> Result<Config> {
|
||||
let json = cmd(&[
|
||||
"podman",
|
||||
"image",
|
||||
"inspect",
|
||||
image,
|
||||
"--format",
|
||||
"{{json .Config}}",
|
||||
])?;
|
||||
let config: Config = serde_json::from_str(json.trim())
|
||||
.with_context(|| anyhow!("failed to parse image inspect output for '{image}'"))?;
|
||||
Ok(config)
|
||||
}
|
||||
|
||||
/// Infer the command argv from the image config.
|
||||
///
|
||||
/// Concatenates ENTRYPOINT + CMD (Docker semantics). If neither is present,
|
||||
/// falls back to `["/bin/sh"]`.
|
||||
pub fn infer_argv(config: &Config) -> Vec<String> {
|
||||
let parts: Vec<String> = config
|
||||
.entrypoint
|
||||
.iter()
|
||||
.chain(config.cmd.iter())
|
||||
.cloned()
|
||||
.collect();
|
||||
|
||||
if parts.is_empty() {
|
||||
vec!["/bin/sh".into()]
|
||||
} else {
|
||||
parts
|
||||
}
|
||||
}
|
||||
|
||||
/// Join items as null-delimited bytes.
|
||||
pub fn null_delimited(items: &[String]) -> Vec<u8> {
|
||||
let mut data = Vec::new();
|
||||
for item in items {
|
||||
data.extend_from_slice(item.as_bytes());
|
||||
data.push(0);
|
||||
}
|
||||
data
|
||||
}
|
||||
|
||||
/// Install `content` into the mounted rootfs at `<mount>/boco/<name>` with
|
||||
/// the given mode.
|
||||
fn install_into_rootfs(mount: &str, name: &str, mode: &str, content: &[u8]) -> Result<()> {
|
||||
let temp = tempfile::NamedTempFile::new()?;
|
||||
fs::write(temp.path(), content)?;
|
||||
let src = temp.path().to_str().context("temp path is not UTF-8")?;
|
||||
let dest = format!("{mount}/boco/{name}");
|
||||
cmd(&[
|
||||
"podman", "unshare", "--", "install", "-D", "-m", mode, src, &dest,
|
||||
])?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Inject /boco/init (binary), /boco/exec (null-delimited argv), /boco/env
|
||||
/// (null-delimited env), and optionally /boco/user and /boco/workdir into a
|
||||
/// mounted container image rootfs.
|
||||
pub fn inject(
|
||||
mount_path: &Path,
|
||||
argv: &[String],
|
||||
env: &[String],
|
||||
user: Option<&str>,
|
||||
working_dir: Option<&str>,
|
||||
) -> Result<()> {
|
||||
let mount_str = mount_path.to_str().context("mount path is not UTF-8")?;
|
||||
|
||||
let init_binary = fs::read(init_binary_path()?).context("Failed to read boco-init binary")?;
|
||||
let exec_data = null_delimited(argv);
|
||||
let env_data = null_delimited(env);
|
||||
|
||||
install_into_rootfs(mount_str, "init", "755", &init_binary)?;
|
||||
install_into_rootfs(mount_str, "exec", "644", &exec_data)?;
|
||||
if !env_data.is_empty() {
|
||||
install_into_rootfs(mount_str, "env", "644", &env_data)?;
|
||||
}
|
||||
|
||||
if let Some(user) = user.filter(|u| !u.is_empty()) {
|
||||
install_into_rootfs(mount_str, "user", "644", user.as_bytes())?;
|
||||
}
|
||||
|
||||
if let Some(dir) = working_dir.filter(|d| !d.is_empty()) {
|
||||
install_into_rootfs(mount_str, "workdir", "644", dir.as_bytes())?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
+7
-7
@@ -2,17 +2,17 @@ mod build;
|
||||
mod command;
|
||||
mod forward;
|
||||
mod image;
|
||||
mod meta;
|
||||
mod inject;
|
||||
mod qemu;
|
||||
mod registry;
|
||||
|
||||
use anyhow::Result;
|
||||
use clap::{Parser, Subcommand};
|
||||
|
||||
use crate::{build::BuildCmd, image::ImageCmd, qemu::RunCmd};
|
||||
use crate::{build::BuildCmd, image::ImageCmd, qemu::BootCmd};
|
||||
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(about = "Build bootable initrd VMs from container images")]
|
||||
#[command(about = "Turn containers into bootable VMs")]
|
||||
struct Cli {
|
||||
#[command(subcommand)]
|
||||
command: Commands,
|
||||
@@ -23,8 +23,8 @@ enum Commands {
|
||||
/// Build initrd from an image (podman image must exist)
|
||||
Build(BuildCmd),
|
||||
/// Launch a previously built VM via QEMU.
|
||||
Run(RunCmd),
|
||||
/// List slim images in the registry
|
||||
Boot(BootCmd),
|
||||
/// List boco images in the registry
|
||||
#[command(subcommand)]
|
||||
Image(ImageCmd),
|
||||
}
|
||||
@@ -35,8 +35,8 @@ fn main() -> Result<()> {
|
||||
Commands::Build(cmd) => {
|
||||
build::build(cmd)?;
|
||||
}
|
||||
Commands::Run(cmd) => {
|
||||
qemu::run(cmd)?;
|
||||
Commands::Boot(cmd) => {
|
||||
qemu::boot(cmd)?;
|
||||
}
|
||||
Commands::Image(cmd) => {
|
||||
image::run(cmd)?;
|
||||
|
||||
-28
@@ -1,28 +0,0 @@
|
||||
use std::fs;
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::registry::registry_dir;
|
||||
|
||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||
pub struct Meta {
|
||||
/// Path to the init program
|
||||
pub init: String,
|
||||
}
|
||||
|
||||
const FILENAME: &str = "meta.toml";
|
||||
|
||||
impl Meta {
|
||||
pub fn load(image: &str) -> anyhow::Result<Self> {
|
||||
let path = registry_dir(image)?.join(FILENAME);
|
||||
let s = fs::read_to_string(path)?;
|
||||
Ok(toml::from_str(&s)?)
|
||||
}
|
||||
|
||||
pub fn save(&self, image: &str) -> anyhow::Result<()> {
|
||||
let path = registry_dir(image)?.join(FILENAME);
|
||||
let s = toml::to_string_pretty(self)?;
|
||||
fs::write(path, &s)?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
+81
-30
@@ -1,18 +1,22 @@
|
||||
//! QEMU: boot a registry entry with qemu-system-x86_64 using direct kernel
|
||||
//! boot (-kernel/-initrd).
|
||||
//! boot (-kernel/-initrd or -drive). The kernel is shared across all VMs
|
||||
//! at $XDG_DATA_HOME/boco/registry/vmlinuz. A universal /boco/init script (injected
|
||||
//! at build time) handles VM bootstrap; /boco/exec runs the container's
|
||||
//! CMD/ENTRYPOINT. Runtime overrides are delivered as `boco.cmd=<base64>`
|
||||
//! on the kernel cmdline.
|
||||
|
||||
use anyhow::{Context, Result, bail};
|
||||
use base64::Engine;
|
||||
use clap::Args;
|
||||
use std::{fmt::Write as _, process::Command};
|
||||
|
||||
use crate::{
|
||||
forward::PortForward,
|
||||
meta::Meta,
|
||||
registry::{registry_base_dir, registry_dir},
|
||||
};
|
||||
|
||||
#[derive(Args, Debug)]
|
||||
pub struct RunCmd {
|
||||
pub struct BootCmd {
|
||||
/// Image tag / registry subdir name
|
||||
name: String,
|
||||
|
||||
@@ -23,14 +27,28 @@ pub struct RunCmd {
|
||||
/// Forward ports from host to guest. Example: `tcp:0.0.0.0:80-:8080`
|
||||
#[clap(long)]
|
||||
forward: Vec<PortForward>,
|
||||
|
||||
/// Override the command to exec in the VM (base64-encoded on the kernel
|
||||
/// cmdline as boco.cmd=<b64>). Overrides the CMD inferred at build time.
|
||||
#[clap(long)]
|
||||
cmd: Option<String>,
|
||||
|
||||
/// Share a host directory into the VM via 9p. Format:
|
||||
/// `<host-path>` or `<host-path>:<guest-path>`. When the guest path is
|
||||
/// omitted, the host path is used. Non-absolute guest paths are
|
||||
/// relative to the image's WORKINGDIR. Can be repeated.
|
||||
#[clap(long)]
|
||||
mount: Vec<String>,
|
||||
}
|
||||
|
||||
pub(crate) fn run(
|
||||
RunCmd {
|
||||
pub(crate) fn boot(
|
||||
BootCmd {
|
||||
name,
|
||||
memory,
|
||||
forward,
|
||||
}: RunCmd,
|
||||
cmd,
|
||||
mount,
|
||||
}: BootCmd,
|
||||
) -> Result<()> {
|
||||
let reg_dir = registry_dir(&name)?;
|
||||
let vmlinuz_path = registry_base_dir()?.join("vmlinuz");
|
||||
@@ -38,40 +56,71 @@ pub(crate) fn run(
|
||||
let qcow2_path = reg_dir.join("image.qcow2");
|
||||
if !vmlinuz_path.exists() {
|
||||
// TODO: guide user in how to set up a kernel
|
||||
bail!("No kernel available.")
|
||||
bail!(
|
||||
"No kernel available. Place a vmlinuz at {}",
|
||||
vmlinuz_path.display()
|
||||
);
|
||||
}
|
||||
|
||||
let meta = Meta::load(&name).context("Failed to load meta.toml. Run `slim build` first.")?;
|
||||
// TODO: sanity-check for spaces
|
||||
let init_arg = format!("init={}", meta.init);
|
||||
|
||||
let fs_args;
|
||||
let mut cmdline = vec![
|
||||
"console=ttyS0,115200",
|
||||
"rw",
|
||||
"earlyprintk=serial",
|
||||
"nokaslr",
|
||||
&init_arg,
|
||||
"devtmpfs.mount=1", // Automatically mount /dev at boot
|
||||
let mut cmdline: Vec<String> = vec![
|
||||
"console=ttyS0,115200".into(),
|
||||
"rw".into(),
|
||||
"earlyprintk=serial".into(),
|
||||
"nokaslr".into(),
|
||||
"init=/boco/init".into(),
|
||||
"devtmpfs.mount=1".into(), // Automatically mount /dev at boot
|
||||
];
|
||||
|
||||
let fs_args;
|
||||
let qcow2_arg = format!("file={},format=qcow2,if=virtio", qcow2_path.display());
|
||||
if qcow2_path.exists() {
|
||||
fs_args = vec!["-drive", &qcow2_arg];
|
||||
cmdline.extend_from_slice(&["root=/dev/vda", "rootfstype=ext4"]);
|
||||
fs_args = vec!["-drive".to_string(), qcow2_arg];
|
||||
cmdline.extend(["root=/dev/vda".to_string(), "rootfstype=ext4".to_string()]);
|
||||
} else if initrd_path.exists() {
|
||||
fs_args = vec!["-initrd", initrd_path.to_str().context("Invalid UTF-8")?];
|
||||
cmdline.push("root=/dev/ram0");
|
||||
let initrd_str = initrd_path.to_str().context("Invalid UTF-8")?.to_string();
|
||||
fs_args = vec!["-initrd".to_string(), initrd_str];
|
||||
cmdline.push("root=/dev/ram0".into());
|
||||
} else {
|
||||
bail!("Registry missing rootfs/initrd for '{name}'. Run `slim build` first.");
|
||||
bail!("Registry missing rootfs/initrd for '{name}'. Run `boco build` first.");
|
||||
}
|
||||
|
||||
if let Some(cmd) = &cmd {
|
||||
let argv = ["/bin/sh".to_string(), "-c".to_string(), cmd.clone()];
|
||||
let data: Vec<u8> = argv.join("\0").into_bytes();
|
||||
let encoded = base64::engine::general_purpose::STANDARD.encode(&data);
|
||||
cmdline.push(format!("boco.cmd={encoded}"));
|
||||
}
|
||||
|
||||
// Build 9p shares for each --mount. Tags are short (boco0, boco1, …)
|
||||
// because 9p mount_tag has a ~31-byte limit. The guest destination path
|
||||
// is passed on the kernel cmdline as boco.mount=<tag>:<base64(guest_path)>.
|
||||
// If no guest path is specified, the host path is used as the guest path.
|
||||
let mut virtfs_args: Vec<String> = Vec::new();
|
||||
for (i, spec) in mount.iter().enumerate() {
|
||||
let (host_path, guest_path) = match spec.split_once(':') {
|
||||
Some((h, g)) => (h, g),
|
||||
None => (spec.as_str(), spec.as_str()),
|
||||
};
|
||||
let canonical = std::path::Path::new(host_path)
|
||||
.canonicalize()
|
||||
.with_context(|| format!("Cannot resolve mount path '{host_path}'"))?;
|
||||
let host_str = canonical
|
||||
.to_str()
|
||||
.context("Mount path is not valid UTF-8")?;
|
||||
let tag = format!("boco{i}");
|
||||
let dest_b64 = base64::engine::general_purpose::STANDARD.encode(guest_path.as_bytes());
|
||||
|
||||
// QEMU's QemuOpts splits on commas — escape literal commas in the
|
||||
// path as ",," per QEMU convention.
|
||||
let host_escaped = host_str.replace(',', ",,");
|
||||
virtfs_args.push("-virtfs".into());
|
||||
virtfs_args.push(format!(
|
||||
"local,path={host_escaped},mount_tag={tag},security_model=mapped-xattr"
|
||||
));
|
||||
cmdline.push(format!("boco.mount={tag}:{dest_b64}"));
|
||||
}
|
||||
|
||||
println!("Booting {name} from registry: {}", reg_dir.display());
|
||||
println!(
|
||||
" qemu-system-x86_64 -m 256 -nographic -kernel {} -initrd {} -append 'console=ttyS0'",
|
||||
vmlinuz_path.display(),
|
||||
initrd_path.display()
|
||||
);
|
||||
|
||||
let cmdline = cmdline.join(" ");
|
||||
|
||||
@@ -90,8 +139,10 @@ pub(crate) fn run(
|
||||
.args(["-m", &memory])
|
||||
.arg("-kernel")
|
||||
.arg(vmlinuz_path.as_os_str())
|
||||
.args(fs_args)
|
||||
.args(&fs_args)
|
||||
.args(&virtfs_args)
|
||||
.args(["-snapshot"])
|
||||
.args(["-no-reboot"])
|
||||
.args(["-append", &cmdline])
|
||||
.args(["-nographic"])
|
||||
.args(["-nic", &network]);
|
||||
|
||||
+10
-4
@@ -1,12 +1,12 @@
|
||||
//! Registry: local storage of built VM artifacts under
|
||||
//! `$XDG_DATA_HOME/slim-rs/registry/<image>/`.
|
||||
//! `$XDG_DATA_HOME/boco/registry/<image>/`.
|
||||
|
||||
use anyhow::{Context, Result, anyhow, bail};
|
||||
use std::{fs, io, path::PathBuf};
|
||||
|
||||
/// Validate a user-supplied image name before it is used in a registry path.
|
||||
///
|
||||
/// The name becomes a directory under `$XDG_DATA_HOME/slim-rs/registry/`, so
|
||||
/// The name becomes a directory under `$XDG_DATA_HOME/boco/registry/`, so
|
||||
/// path separators and `.`/`..` would allow escaping that directory.
|
||||
/// Allow-list: ASCII alphanumerics plus `.`, `_`, `:`, `-` (covers image
|
||||
/// refs like `alpine:3.15`).
|
||||
@@ -27,11 +27,17 @@ pub(crate) fn validate_image_name(name: &str) -> Result<()> {
|
||||
}
|
||||
|
||||
pub(crate) fn registry_base_dir() -> Result<PathBuf> {
|
||||
let base = xdg::BaseDirectories::with_prefix("slim-rs");
|
||||
let base = xdg::BaseDirectories::with_prefix("boco");
|
||||
base.create_data_directory("registry")
|
||||
.context("Failed to create XDG_DATA_HOME subdirectory")
|
||||
}
|
||||
|
||||
pub(crate) fn init_binary_path() -> Result<PathBuf> {
|
||||
let base = xdg::BaseDirectories::with_prefix("boco");
|
||||
base.get_data_file("boco-init")
|
||||
.context("boco-init not found in XDG data dir")
|
||||
}
|
||||
|
||||
pub(crate) fn registry_dir(image: &str) -> Result<PathBuf> {
|
||||
validate_image_name(image)?;
|
||||
let base = registry_base_dir()?;
|
||||
@@ -56,7 +62,7 @@ mod tests {
|
||||
fn accepts_valid_image_names() {
|
||||
for name in [
|
||||
"alpine:3.15",
|
||||
"slim",
|
||||
"boco",
|
||||
"mock-vm",
|
||||
"my_vm",
|
||||
"a.b.c",
|
||||
|
||||
Reference in New Issue
Block a user