Re: [PATCH v5 6/8] img/app: create /run/user and /run/wait very early in boot

[Alyssa Ross <hi@alyssa.is>]

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

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

> There's no real reason not to use the existing call to mkdir for that.
> This allows getting rid of calls to mkdir from directories/up,
> mdev/listen, and mdev/wait, so the overall diffstat is negative.
>
> Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
> ---
>  img/app/etc/mdev/listen                   | 1 -
>  img/app/etc/mdev/wait                     | 1 -
>  img/app/etc/s6-linux-init/scripts/rc.init | 2 +-
>  img/app/etc/s6-rc/directories/up          | 1 -
>  4 files changed, 1 insertion(+), 4 deletions(-)
>
> 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-linux-init/scripts/rc.init b/img/app/etc/s6-linux-init/scripts/rc.init
> index a9e43aae685597b94ebcd431d4bb560f2d02a92e..d8b71affa1752c6fd7455412cde9c76fa0752713 100755
> --- a/img/app/etc/s6-linux-init/scripts/rc.init
> +++ b/img/app/etc/s6-linux-init/scripts/rc.init
> @@ -4,7 +4,7 @@
>  
>  if { s6-rc-init -c /etc/s6-rc /run/service }
>  
> -if { mkdir -p -m 0755 /dev/pts /dev/shm }
> +if { mkdir -p -m 0755 /dev/pts /dev/shm /run/user /run/wait }

Let's do this with run-image in the Makefile as well.

>  if { modprobe overlay }
>  if { mount -a }
>  
> diff --git a/img/app/etc/s6-rc/directories/up b/img/app/etc/s6-rc/directories/up
> index be60547cc7ba562d3220fabbe5bca630aa4b1f1a..d2688029151d622eba1a2d9d06e4435e4ff632e6 100644
> --- a/img/app/etc/s6-rc/directories/up
> +++ b/img/app/etc/s6-rc/directories/up
> @@ -7,5 +7,4 @@
>  # SPDX-FileCopyrightText: 2022 Unikie
>  
>  if { mkdir -m 1777 /tmp/.X11-unix /tmp/.ICE-unix /tmp/.XIM-unix /tmp/.font-unix }
> -if { mkdir -m 0755 /run/user }
>  if { mkdir -m 0700 /run/user/0 }
> -- 
> Sincerely,
> Demi Marie Obenour (she/her/hers)

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