Thanks, applied as caf45554bc1a269a36adb44f4acca029651ad9ec.

Michael

[sent from post-receive hook]

On Tue, 20 Jul 2021 13:49:16 +0200, Marco Felsch <[email protected]> 
wrote:
> Signed-off-by: Marco Felsch <[email protected]>
> Message-Id: <[email protected]>
> Signed-off-by: Michael Olbrich <[email protected]>
> 
> diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
> index 9586ff60bf34..e34d59a0d314 100644
> --- a/rules/util-linux-ng.in
> +++ b/rules/util-linux-ng.in
> @@ -514,4 +514,15 @@ config UTIL_LINUX_NG_SULOGIN
>  comment "BusyBox' sulogin is selected!"
>       depends on BUSYBOX_SULOGIN
>  
> +config UTIL_LINUX_NG_SWITCH_ROOT
> +     bool
> +     depends on !BUSYBOX_SWITCH_ROOT
> +     prompt "switch_root"
> +     help
> +       switch to another filesystem as the root of the mount
> +       tree.
> +
> +comment "BusyBox' switch_root is selected!"
> +     depends on BUSYBOX_SWITCH_ROOT
> +
>  endif
> diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
> index b0633bca35d0..57b9e7d78322 100644
> --- a/rules/util-linux-ng.make
> +++ b/rules/util-linux-ng.make
> @@ -108,7 +108,7 @@ UTIL_LINUX_NG_CONF_OPT    := \
>       --disable-cal \
>       --disable-logger \
>       --disable-whereis \
> -     --disable-switch_root \
> +     --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT)-switch_root \
>       --disable-pivot_root \
>       --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LSMEM)-lsmem \
>       --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_CHMEM)-chmem \
> @@ -352,6 +352,9 @@ endif
>  ifdef PTXCONF_UTIL_LINUX_NG_SULOGIN
>       @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/sulogin)
>  endif
> +ifdef PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT
> +     @$(call install_copy, util-linux-ng, 0, 0, 0755, -, 
> /usr/sbin/switch_root)
> +endif
>  
>       @$(call install_finish, util-linux-ng)
>  

_______________________________________________
ptxdist mailing list
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to 
[email protected]

Reply via email to