Integrate systemd
Not fully optimized yet, but shouldn't have any regressions
This commit is contained in:
parent
c4d462ea20
commit
790dd0d1f4
9 changed files with 270 additions and 108 deletions
18
munix
18
munix
|
|
@ -136,21 +136,22 @@ exec bwrap --unshare-all --share-net \
|
|||
--dev /dev --dir /dev/input --dev-bind /dev/kvm /dev/kvm \
|
||||
--ro-bind "$MUVM_PATH" /run/munix/muvm \
|
||||
--ro-bind "$PASST_PATH" /run/munix/passt \
|
||||
--ro-bind "$MICROVM_CLOSURE/sw/bin/env" /usr/bin/env \
|
||||
--ro-bind "$SCRIPT_PATH/munix-init-root" /usr/bin/munix-init-root \
|
||||
--ro-bind "$SCRIPT_PATH/munix-init-user" /usr/bin/munix-init-user \
|
||||
--ro-bind "$MUVM_PATH/muvm-guest" /opt/bin/muvm-remote \
|
||||
--ro-bind "$MUVM_PATH/muvm-guest" /opt/bin/muvm-configure-network \
|
||||
--ro-bind "$MUVM_PATH/muvm-guest" /opt/bin/muvm-pwbridge \
|
||||
--symlink "$MICROVM_CLOSURE/etc/systemd" /etc/systemd \
|
||||
--ro-bind /nix/store /nix/store \
|
||||
--ro-bind /run/systemd/resolve /run/systemd/resolve \
|
||||
--ro-bind /etc/resolv.conf /etc/resolv.conf \
|
||||
--file 11 /etc/passwd \
|
||||
--file 12 /etc/group \
|
||||
--file 13 /etc/resolv.conf \
|
||||
--dir "$XDG_RUNTIME_DIR" \
|
||||
--setenv PATH "/run/munix/muvm:/run/munix/passt:$MICROVM_CLOSURE/sw/bin" \
|
||||
"${BWRAP_ARGS[@]}" \
|
||||
muvm \
|
||||
-x /usr/bin/munix-init-root -X /usr/bin/munix-init-user \
|
||||
--custom-init-cmdline "$MICROVM_CLOSURE/sw/sbin/init --log-target=console" \
|
||||
"${MUVM_ARGS[@]}" \
|
||||
-e MUVM_UDEVD_PATH="$MICROVM_CLOSURE/sw/bin/true" \
|
||||
-e container=munix \
|
||||
-e MICROVM_CLOSURE="$MICROVM_CLOSURE" \
|
||||
-e MICROVM_UID="$MICROVM_UID" -e MICROVM_GID="$MICROVM_GID" \
|
||||
-i -t "${MICROVM_COMMAND[@]}" \
|
||||
|
|
@ -163,4 +164,7 @@ EOF
|
|||
munix:x:$MICROVM_GID:
|
||||
nogroup:x:65534:
|
||||
EOF
|
||||
)
|
||||
) \
|
||||
13< /etc/resolv.conf
|
||||
|
||||
# --log-level=debug
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue