From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Marco Felsch <m.felsch@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] util-linux-ng: add switch_root option
Date: Tue, 20 Jul 2021 13:49:16 +0200 [thread overview]
Message-ID: <20210720114916.2629988-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20210715081808.3948-1-m.felsch@pengutronix.de>
Thanks, applied as caf45554bc1a269a36adb44f4acca029651ad9ec.
Michael
[sent from post-receive hook]
On Tue, 20 Jul 2021 13:49:16 +0200, Marco Felsch <m.felsch@pengutronix.de> wrote:
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> Message-Id: <20210715081808.3948-1-m.felsch@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
prev parent reply other threads:[~2021-07-20 11:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-15 8:18 [ptxdist] [PATCH 1/2] " Marco Felsch
2021-07-15 8:18 ` [ptxdist] [PATCH 2/2] util-linux-ng: add pivot_root option Marco Felsch
2021-07-20 11:49 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-07-20 11:49 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210720114916.2629988-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=m.felsch@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox