From: Leonid Krivoshein <klark.devel@gmail.com> To: make-initrd@lists.altlinux.org Subject: [make-initrd] [PATCH v1 13/41] fork pipeline: rootfs step modified Date: Fri, 24 Sep 2021 18:56:48 +0300 Message-ID: <2aa9a399-14c7-4eee-635c-0383d515e3cc@gmail.com> (raw) --- .../bootchain-core/data/lib/bootchain/rootfs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/make-initrd/features/bootchain-core/data/lib/bootchain/rootfs b/make-initrd/features/bootchain-core/data/lib/bootchain/rootfs index e4b2ca9..1801a81 100755 --- a/make-initrd/features/bootchain-core/data/lib/bootchain/rootfs +++ b/make-initrd/features/bootchain-core/data/lib/bootchain/rootfs @@ -1,10 +1,11 @@ #!/bin/bash -efu -. pipeline-sh-functions +. bootchain-sh-functions -[ -n "$prevdir" ] || - fatal "no previous step to use as rootfs" - -run mount --move "$prevdir" "$rootmnt" +launch_step_once +[ -n "$prevdir" ] && mountpoint -q -- "$prevdir" || + fatal "no previous step results to use as rootfs" +[ "$prevdir" = "$rootmnt" ] || + run mount --move -- "$prevdir" "$rootmnt" echo localdev > /etc/initrd/method -exit 2 +break_bc_loop -- 2.21.0
reply other threads:[~2021-09-24 15:56 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=2aa9a399-14c7-4eee-635c-0383d515e3cc@gmail.com \ --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