Make-initrd development discussion
 help / color / mirror / Atom feed
* [make-initrd] [PATCH v6 17/22] bootchain-core: few minor improvements to the rootfs step
@ 2021-10-24 17:22 Leonid Krivoshein
  0 siblings, 0 replies; only message in thread
From: Leonid Krivoshein @ 2021-10-24 17:22 UTC (permalink / raw)
  To: make-initrd

Now the step is run only once, additional checks are performed,
and a safe way to end the daemon main loop is used.

Signed-off-by: Leonid Krivoshein <klark.devel@gmail.com>
---
 features/bootchain-core/data/lib/bootchain/rootfs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/features/bootchain-core/data/lib/bootchain/rootfs b/features/bootchain-core/data/lib/bootchain/rootfs
index 6ac64a6..aaba01d 100755
--- a/features/bootchain-core/data/lib/bootchain/rootfs
+++ b/features/bootchain-core/data/lib/bootchain/rootfs
@@ -2,9 +2,10 @@
 
 . bootchain-sh-functions
 
-[ -n "$prevdir" ] ||
+launch_step_once
+[ -n "$prevdir" ] && mountpoint -q -- "$prevdir" ||
 	fatal "no previous step to use as rootfs"
-
-run mount --move "$prevdir" "$rootmnt"
+[ "$prevdir" = "$rootmnt" ] ||
+	run mount --move -- "$prevdir" "$rootmnt"
 echo localdev > /etc/initrd/method
-exit 2
+break_bc_loop
-- 
2.24.1



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-10-24 17:22 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-24 17:22 [make-initrd] [PATCH v6 17/22] bootchain-core: few minor improvements to the rootfs step Leonid Krivoshein

Make-initrd development discussion

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://lore.altlinux.org/make-initrd/0 make-initrd/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 make-initrd make-initrd/ http://lore.altlinux.org/make-initrd \
		make-initrd@lists.altlinux.org make-initrd@lists.altlinux.ru make-initrd@lists.altlinux.com
	public-inbox-index make-initrd

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://lore.altlinux.org/org.altlinux.lists.make-initrd


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