mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 1/2] util-linux-ng: add switch_root option
@ 2021-07-15  8:18 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] util-linux-ng: add switch_root option Michael Olbrich
  0 siblings, 2 replies; 4+ messages in thread
From: Marco Felsch @ 2021-07-15  8:18 UTC (permalink / raw)
  To: ptxdist

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 rules/util-linux-ng.in   | 11 +++++++++++
 rules/util-linux-ng.make |  5 ++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index 9586ff60b..e34d59a0d 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 63d6f68fd..25759f5e2 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -97,7 +97,7 @@ UTIL_LINUX_NG_CONF_OPT	:= \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_WDCTL)-wdctl \
 	--disable-cal \
 	--disable-logger \
-	--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 \
@@ -339,6 +339,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)
 
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [ptxdist] [PATCH 2/2] util-linux-ng: add pivot_root option
  2021-07-15  8:18 [ptxdist] [PATCH 1/2] util-linux-ng: add switch_root option Marco Felsch
@ 2021-07-15  8:18 ` Marco Felsch
  2021-07-20 11:49   ` [ptxdist] [APPLIED] " Michael Olbrich
  2021-07-20 11:49 ` [ptxdist] [APPLIED] util-linux-ng: add switch_root option Michael Olbrich
  1 sibling, 1 reply; 4+ messages in thread
From: Marco Felsch @ 2021-07-15  8:18 UTC (permalink / raw)
  To: ptxdist

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 rules/util-linux-ng.in   | 10 ++++++++++
 rules/util-linux-ng.make |  5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index e34d59a0d..df493d529 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -525,4 +525,14 @@ config UTIL_LINUX_NG_SWITCH_ROOT
 comment "BusyBox' switch_root is selected!"
 	depends on BUSYBOX_SWITCH_ROOT
 
+config UTIL_LINUX_NG_PIVOT_ROOT
+	bool
+	depends on !BUSYBOX_PIVOT_ROOT
+	prompt "pivot_root"
+	help
+	  change the root filesystem.
+
+comment "BusyBox' pivot_root is selected!"
+	depends on BUSYBOX_PIVOT_ROOT
+
 endif
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 25759f5e2..dd3eb0e01 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -98,7 +98,7 @@ UTIL_LINUX_NG_CONF_OPT	:= \
 	--disable-cal \
 	--disable-logger \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT)-switch_root \
-	--disable-pivot_root \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_PIVOT_ROOT)-pivot_root \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LSMEM)-lsmem \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_CHMEM)-chmem \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_IPCRM)-ipcrm \
@@ -342,6 +342,9 @@ endif
 ifdef PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT
 	@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/switch_root)
 endif
+ifdef PTXCONF_UTIL_LINUX_NG_PIVOT_ROOT
+	@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/pivot_root)
+endif
 
 	@$(call install_finish, util-linux-ng)
 
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [ptxdist] [APPLIED] util-linux-ng: add switch_root option
  2021-07-15  8:18 [ptxdist] [PATCH 1/2] util-linux-ng: add switch_root option 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 ` Michael Olbrich
  1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2021-07-20 11:49 UTC (permalink / raw)
  To: ptxdist; +Cc: Marco Felsch

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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [ptxdist] [APPLIED] util-linux-ng: add pivot_root option
  2021-07-15  8:18 ` [ptxdist] [PATCH 2/2] util-linux-ng: add pivot_root option Marco Felsch
@ 2021-07-20 11:49   ` Michael Olbrich
  0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2021-07-20 11:49 UTC (permalink / raw)
  To: ptxdist; +Cc: Marco Felsch

Thanks, applied as 4129dc58d1bc6f075d5dff9fcf36981088106386.

Michael

[sent from post-receive hook]

On Tue, 20 Jul 2021 13:49:17 +0200, Marco Felsch <m.felsch@pengutronix.de> wrote:
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> Message-Id: <20210715081808.3948-2-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 e34d59a0d314..df493d52909b 100644
> --- a/rules/util-linux-ng.in
> +++ b/rules/util-linux-ng.in
> @@ -525,4 +525,14 @@ config UTIL_LINUX_NG_SWITCH_ROOT
>  comment "BusyBox' switch_root is selected!"
>  	depends on BUSYBOX_SWITCH_ROOT
>  
> +config UTIL_LINUX_NG_PIVOT_ROOT
> +	bool
> +	depends on !BUSYBOX_PIVOT_ROOT
> +	prompt "pivot_root"
> +	help
> +	  change the root filesystem.
> +
> +comment "BusyBox' pivot_root is selected!"
> +	depends on BUSYBOX_PIVOT_ROOT
> +
>  endif
> diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
> index 57b9e7d78322..f0402b44e0a5 100644
> --- a/rules/util-linux-ng.make
> +++ b/rules/util-linux-ng.make
> @@ -109,7 +109,7 @@ UTIL_LINUX_NG_CONF_OPT	:= \
>  	--disable-logger \
>  	--disable-whereis \
>  	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT)-switch_root \
> -	--disable-pivot_root \
> +	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_PIVOT_ROOT)-pivot_root \
>  	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LSMEM)-lsmem \
>  	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_CHMEM)-chmem \
>  	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_IPCRM)-ipcrm \
> @@ -355,6 +355,9 @@ endif
>  ifdef PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT
>  	@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/switch_root)
>  endif
> +ifdef PTXCONF_UTIL_LINUX_NG_PIVOT_ROOT
> +	@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/pivot_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


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-07-20 11:52 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-15  8:18 [ptxdist] [PATCH 1/2] util-linux-ng: add switch_root option 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 ` [ptxdist] [APPLIED] util-linux-ng: add switch_root option Michael Olbrich

mailarchive of the ptxdist mailing list

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://lore.ptxdist.org/ptxdist/0 ptxdist/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ptxdist ptxdist/ https://lore.ptxdist.org/ptxdist \
		ptxdist@pengutronix.de
	public-inbox-index ptxdist

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git