Skip to content

Commit

Permalink
Merge pull request #114 from ThibF/thibf/tmp_mounting
Browse files Browse the repository at this point in the history
virtme-ng: export real /tmp to guest
  • Loading branch information
Andrea Righi authored May 24, 2024
2 parents c10dd21 + da5b586 commit 3332cca
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
5 changes: 0 additions & 5 deletions virtme/commands/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -447,11 +447,6 @@ def find_kernel_and_mods(arch, args) -> Kernel:
# the modules, just rely on /lib/modules in the target rootfs.
if root_dir == "/" or args.root != '/':
kernel.use_root_mods = True
elif root_dir.startswith("/tmp"):
sys.stderr.write(
"\nWarning: /tmp is hidden inside the guest, "
+ "kernel modules won't be supported at runtime unless you move them somewhere else.\n\n"
)
kernel.moddir = f"{root_dir}/lib/modules/{kver}"
if not os.path.exists(kernel.moddir):
kernel.modfiles = []
Expand Down
5 changes: 2 additions & 3 deletions virtme/guest/virtme-init
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,13 @@ mount -t proc -o nosuid,noexec,nodev proc /proc/
mount -t sysfs -o nosuid,noexec,nodev sys /sys/

# Mount tmpfs dirs
mount -t tmpfs tmpfs /tmp/
mount -t tmpfs run /run/

# Setup rw filesystem overlays
for tag in "${!virtme_rw_overlay@}"; do
dir="${!tag}"
upperdir="/tmp/$tag/upper"
workdir="/tmp/$tag/work"
upperdir="/run/tmp/$tag/upper"
workdir="/run/tmp/$tag/work"
mkdir -p "$upperdir" "$workdir"
mnt_opts="xino=off,lowerdir=$dir,upperdir=$upperdir,workdir=$workdir"
mount -t overlay -o "${mnt_opts}" "${tag}" "${dir}" &
Expand Down
2 changes: 1 addition & 1 deletion virtme_ng/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@ def _get_virtme_overlay_rwdir(self, args):
else:
self.virtme_param["overlay_rwdir"] = " ".join(
f"--overlay-rwdir {d}"
for d in ("/etc", "/lib", "/home", "/opt", "/srv", "/usr", "/var")
for d in ("/etc", "/lib", "/home", "/opt", "/srv", "/usr", "/var", "/tmp")
)
# Add user-specified overlays.
for item in args.overlay_rwdir:
Expand Down

0 comments on commit 3332cca

Please sign in to comment.