Re: [PATCH v3 2/4] Move all files for the image into a subdirectory

Alyssa Ross
2025-09-17T12:30:42Z

[-- Attachment #1: Type: text/plain, Size: 2772 bytes --]

Demi Marie Obenour <demiobenour@gmail.com> writes:

> diff --git a/img/app/Makefile b/img/app/Makefile
> index 73db07cc4c781d9c41cdf41a6214298aae8de58a..0099aa3b9626bfcc2079e5c67401db4e5316caeb 100644
> --- a/img/app/Makefile
> +++ b/img/app/Makefile
> @@ -30,32 +30,32 @@ $(imgdir)/appvm/blk/root.img: ../../scripts/make-gpt.sh ../../scripts/sfdisk-fie
> mv $@.tmp $@
>
> VM_FILES = \
> - etc/dbus-1/session.conf \
> - etc/fonts/fonts.conf \
> - etc/fstab \
> - etc/init \
> - etc/mdev.conf \
> - etc/mdev/iface \
> - etc/mdev/listen \
> - etc/mdev/virtiofs \
> - etc/mdev/wait \
> - etc/passwd \
> - etc/pipewire/pipewire.conf \
> - etc/resolv.conf \
> - etc/s6-linux-init/env/DBUS_SESSION_BUS_ADDRESS \
> - etc/s6-linux-init/env/DISPLAY \
> - etc/s6-linux-init/env/GTK_USE_PORTAL \
> - etc/s6-linux-init/env/NIX_XDG_DESKTOP_PORTAL_DIR \
> - etc/s6-linux-init/env/WAYLAND_DISPLAY \
> - etc/s6-linux-init/env/XDG_RUNTIME_DIR \
> - etc/s6-linux-init/run-image/service/getty-hvc0/run \
> - etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/notification-fd \
> - etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/run \
> - etc/s6-linux-init/scripts/rc.init \
> - etc/s6-linux-init/scripts/rc.shutdown \
> - etc/s6-linux-init/scripts/rc.shutdown.final \
> - etc/wireplumber/wireplumber.conf.d/99_spectrum.conf \
> - etc/xdg/xdg-desktop-portal/portals.conf
> + image/etc/dbus-1/session.conf \
> + image/etc/fonts/fonts.conf \
> + image/etc/fstab \
> + image/etc/init \
> + image/etc/mdev.conf \
> + image/etc/mdev/iface \
> + image/etc/mdev/listen \
> + image/etc/mdev/virtiofs \
> + image/etc/mdev/wait \
> + image/etc/passwd \
> + image/etc/pipewire/pipewire.conf \
> + image/etc/resolv.conf \
> + image/etc/s6-linux-init/env/DBUS_SESSION_BUS_ADDRESS \
> + image/etc/s6-linux-init/env/DISPLAY \
> + image/etc/s6-linux-init/env/GTK_USE_PORTAL \
> + image/etc/s6-linux-init/env/NIX_XDG_DESKTOP_PORTAL_DIR \
> + image/etc/s6-linux-init/env/WAYLAND_DISPLAY \
> + image/etc/s6-linux-init/env/XDG_RUNTIME_DIR \
> + image/etc/s6-linux-init/run-image/service/getty-hvc0/run \
> + image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/notification-fd \
> + image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/run \
> + image/etc/s6-linux-init/scripts/rc.init \
> + image/etc/s6-linux-init/scripts/rc.shutdown \
> + image/etc/s6-linux-init/scripts/rc.shutdown.final \
> + image/etc/wireplumber/wireplumber.conf.d/99_spectrum.conf \
> + image/etc/xdg/xdg-desktop-portal/portals.conf
>
> VM_DIRS = dev run proc sys tmp \
> etc/s6-linux-init/run-image/service \

It's a bit of a shame that this makes VM_FILES and VM_DIRS asymmetric,
but I guess it's worth it…

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]