This allows code to just assume that they exist, avoiding unneeded calls to mkdir. It also ensures that the directories are created before anything that relies on them runs. Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com> --- img/app/Makefile | 4 +++- img/app/etc/mdev/listen | 1 - img/app/etc/mdev/wait | 1 - img/app/etc/s6-rc/wayland-proxy-virtwl/run | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/img/app/Makefile b/img/app/Makefile index 80ef37ddf0c44636813725bd499e4ea5fad03c06..4b4d64f81d99a01eebe777f3737fef813ebb6d3f 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -55,7 +55,9 @@ VM_FILES = \ etc/s6-linux-init/scripts/rc.shutdown.final \ etc/xdg/xdg-desktop-portal/portals.conf VM_DIRS = dev run proc sys tmp \ - etc/s6-linux-init/run-image/service + etc/s6-linux-init/run-image/service \ + etc/s6-linux-init/run-image/user \ + etc/s6-linux-init/run-image/wait VM_FIFOS = etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/fifo # These are separate because they need to be included, but putting diff --git a/img/app/etc/mdev/listen b/img/app/etc/mdev/listen index 8c8d86407d1f131cf28f335c8f1028d731916203..ab50ee8c5ed1139d1129bac56afa7263af150745 100755 --- a/img/app/etc/mdev/listen +++ b/img/app/etc/mdev/listen @@ -4,7 +4,6 @@ foreground { redirfd -w 2 /dev/null - foreground { mkdir /run/wait } mkfifo /run/wait/${1} } diff --git a/img/app/etc/mdev/wait b/img/app/etc/mdev/wait index 625cd46dc06618309ebaa7230f0bed49e248f3a8..6bddb303d2671ce4e5b8581cd81235d7404916e7 100755 --- a/img/app/etc/mdev/wait +++ b/img/app/etc/mdev/wait @@ -4,7 +4,6 @@ foreground { redirfd -w 2 /dev/null - foreground { mkdir /run/wait } mkfifo /run/wait/${1} } diff --git a/img/app/etc/s6-rc/wayland-proxy-virtwl/run b/img/app/etc/s6-rc/wayland-proxy-virtwl/run index 7b8034368f547cfaf83a81a3b5d73ab864edafff..0715d912953c8a1d326059dfd37c29799fcbb053 100755 --- a/img/app/etc/s6-rc/wayland-proxy-virtwl/run +++ b/img/app/etc/s6-rc/wayland-proxy-virtwl/run @@ -7,7 +7,6 @@ # SPDX-FileCopyrightText: 2022 Unikie foreground { mkdir /tmp/.X11-unix } -foreground { mkdir /run/user } foreground { umask 077 mkdir /run/user/0 -- Sincerely, Demi Marie Obenour (she/her/hers)