From: "Leonid Krivoshein" <klark.devel@gmail.com>
To: make-initrd@lists.altlinux.org
Subject: [make-initrd] [PATCH v6 17/22] bootchain-core: few minor improvements to the rootfs step
Date: Sun, 24 Oct 2021 17:22:39 -0000
Message-ID: <20211024172239.CCE-bxXtWu_TPSYTWHVdiHLyNE6Fy9KJsYsJkqJKoLc@z> (raw)
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
reply other threads:[~2021-10-24 17:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20211024172239.CCE-bxXtWu_TPSYTWHVdiHLyNE6Fy9KJsYsJkqJKoLc@z \
--to=klark.devel@gmail.com \
--cc=make-initrd@lists.altlinux.org \
/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
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