From: "Leonid Krivoshein" <klark.devel@gmail.com> To: make-initrd@lists.altlinux.org Subject: [make-initrd] [PATCH v6 06/22] bootchain-waitdev: improving the logic of the step Date: Sun, 24 Oct 2021 17:20:46 -0000 Message-ID: <20211024172046.qSiFtQ0aHEdTEKTXSAc-cL8Ctu1MW5JcYheTggkIsb8@z> (raw) 1. Breaks the loop when the specified device is actually found. 2. Send a message to the log about the detection of the specified device. 3. Also save the device's real node name to the DEVNAME file. Signed-off-by: Leonid Krivoshein <klark.devel@gmail.com> --- features/bootchain-core/README.md | 6 ++++++ features/bootchain-waitdev/data/lib/bootchain/waitdev | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/features/bootchain-core/README.md b/features/bootchain-core/README.md index 0ccacd9..7f12f1d 100644 --- a/features/bootchain-core/README.md +++ b/features/bootchain-core/README.md @@ -49,6 +49,12 @@ us to optimize fill in `initramfs` only which we are need. - Modularity: loading methods are initially separated from the common code and daemon. +- Allows you to work with shorter and more familiar paths to special files + devices thanks to the use of `DEVNAME` along with `dev`. + +Despite the differences, `chaind` is backward compatible with previously +written steps for the `pipelined` daemon and does not require changes for +configurations with `root=pipeline`. ## External elements of the bootchain (steps-scripts) diff --git a/features/bootchain-waitdev/data/lib/bootchain/waitdev b/features/bootchain-waitdev/data/lib/bootchain/waitdev index bc81673..60464d9 100755 --- a/features/bootchain-waitdev/data/lib/bootchain/waitdev +++ b/features/bootchain-waitdev/data/lib/bootchain/waitdev @@ -13,11 +13,14 @@ while [ -n "$devspec" ]; do read -r devfile < "$envfile" ||: if [ -n "$devfile" ]; then - if [ ! -e "$destdir/dev" ]; then - target="$(readlink-e "$devfile")" + target="$(readlink-e "$devfile" 2>/dev/null ||:)" + + if [ -b "$target" ] || [ -c "$target" ]; then + message "target device found: $target" + printf '%s\n' "$target" > "$destdir/DEVNAME" run cp -a -- "$target" "$destdir/dev" + break fi - break fi fi -- 2.24.1
reply other threads:[~2021-10-24 17:20 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=20211024172046.qSiFtQ0aHEdTEKTXSAc-cL8Ctu1MW5JcYheTggkIsb8@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