Re: [OE-core] [PATCH 4/4] initscripts: Use initctl on sysvinit only

["Peter Kjellerstedt" <peter.kjellerstedt@axis.com>]

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Khem Raj
> Sent: den 17 december 2020 23:55
> To: openembedded-core@lists.openembedded.org
> Cc: Khem Raj <raj.khem@gmail.com>
> Subject: [OE-core] [PATCH 4/4] initscripts: Use initctl on sysvinit only
> 
> Check if init system is sysvinit to recreate initctl, this ensures that
> it can be used with busybox init system as well
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../initscripts/initscripts-1.0/mountall.sh   | 22 ++++++++++++-------
>  1 file changed, 14 insertions(+), 8 deletions(-)
> 
> diff --git a/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh b/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh
> index c719be5d9a..ead4dba46d 100755
> --- a/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh
> +++ b/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh
> @@ -19,15 +19,21 @@
>  test "$VERBOSE" != no && echo "Mounting local filesystems..."
>  mount -at nonfs,nosmbfs,noncpfs 2>/dev/null
> 
> -#
> -# We might have mounted something over /dev, see if /dev/initctl is there.
> -#
> -if test ! -p /dev/initctl
> -then
> -	rm -f /dev/initctl
> -	mknod -m 600 /dev/initctl p
> +
> +# We might have mounted something over /run; see if
> +# /dev/initctl is present.  Look for
> +# /sbin/init.sysvinit to verify that sysvinit (and
> +# not busybox or systemd) is installed as default init).
> +INITCTL="/dev/initctl"
> +if [ ! -p "$INITCTL" ] && [ "$(readlink -- "/sbin/init")" = "/sbin/init.sysvinit" ]; then
> +    # Create new control channel
> +		rm -f "$INITCTL"
> +		mknod -m 600 "$INITCTL" p
> +
> +		# Reopen control channel.
> +		PID="$(pidof -s /sbin/init || echo 1)"
> +		[ -n "$PID" ] && kill -s USR1 "$PID"

Change all references for "/sbin" to "${base_sbindir}" to make it correct 
if usrmerge is used.

>  fi
> -kill -USR1 1
> 
>  #
>  # Execute swapon command again, in case we want to swap to
> --
> 2.29.2

//Peter