From: Alexey Gladkov <gladkov.alexey@gmail.com>
To: make-initrd@lists.altlinux.org
Subject: Re: [make-initrd] [PATCH v6 05/22] bootchain-core, bootchain-waitdev: whitespace
Date: Tue, 26 Oct 2021 11:20:39 +0200
Message-ID: <20211026092039.qbp5trecvufr7ve4@example.org> (raw)
In-Reply-To: <20211024172039.D6F8EA5E4C@lists.altlinux.org>
On Sun, Oct 24, 2021 at 08:20:39PM +0300, Leonid Krivoshein wrote:
> Signed-off-by: Leonid Krivoshein <klark.devel@gmail.com>
> ---
> .../data/bin/bootchain-sh-functions | 28 +++++++++++--------
> features/bootchain-core/data/sbin/chaind | 6 ++--
> .../data/lib/bootchain/waitdev | 1 +
> 3 files changed, 21 insertions(+), 14 deletions(-)
>
> diff --git a/features/bootchain-core/data/bin/bootchain-sh-functions b/features/bootchain-core/data/bin/bootchain-sh-functions
> index fa6201f..f337767 100644
> --- a/features/bootchain-core/data/bin/bootchain-sh-functions
> +++ b/features/bootchain-core/data/bin/bootchain-sh-functions
> @@ -9,9 +9,11 @@ __bootchain_sh_functions=1
> handlerdir=/lib/bootchain
> [ "${ROOT-}" = pipeline ] && mntdir=/dev/pipeline || mntdir=/dev/bootchain
>
> +
> check_parameter()
> {
> local v
> +
> eval "v=\"\${$1-}\""
> [ -n "$v" ] ||
> fatal "Parameter '$1' required"
> @@ -25,20 +27,22 @@ get_parameter()
> resolve_target()
> {
> local target="$1"
> +
> case "${target%%/*}" in
> - '')
> - ;;
> - pipe[0-9]|pipe[0-9][0-9]|pipe[0-9][0-9][0-9])
> - target="$mntdir/dst/step${target:4}"
> - ;;
> - *)
> - if [ -z "${prevdir-}" ]; then
> - message "no previous stop to use"
> - return
> - fi
> - target="$prevdir/${target#/}"
> - ;;
> + '')
> + ;;
> + pipe[0-9]|pipe[0-9][0-9]|pipe[0-9][0-9][0-9])
> + target="$mntdir/dst/step${target:4}"
> + ;;
> + *)
> + if [ -z "${prevdir-}" ]; then
> + message "no previous stop to use"
> + return
> + fi
> + target="$prevdir/${target#/}"
> + ;;
Это неправильное форматирование. Остальной код отформатирован иначе:
git grep -A1 'case "' features/
> esac
> +
> printf '%s' "$target"
> }
>
> diff --git a/features/bootchain-core/data/sbin/chaind b/features/bootchain-core/data/sbin/chaind
> index d401101..08e5e58 100755
> --- a/features/bootchain-core/data/sbin/chaind
> +++ b/features/bootchain-core/data/sbin/chaind
> @@ -7,6 +7,7 @@ message_time=1
> pidfile="/var/run/$PROG.pid"
> logfile="/var/log/$PROG.log"
>
> +
> exit_handler()
> {
> local rc="$?"
> @@ -15,6 +16,7 @@ exit_handler()
> exit $rc
> }
>
> +
> [ ! -f "$pidfile" ] ||
> fatal "already running"
>
> @@ -60,8 +62,8 @@ while [ -n "$chainsteps" ]; do
>
> export name callnum datadir destdir prevdir
>
> - rc=0
> - "$exe" || rc=$?
> + rc=0
> + "$exe" || rc=$?
А это вообще ошибка в форматировании.
>
> if [ "$rc" != 0 ]; then
> [ "$rc" != 2 ] ||
> diff --git a/features/bootchain-waitdev/data/lib/bootchain/waitdev b/features/bootchain-waitdev/data/lib/bootchain/waitdev
> index 74af6ea..bc81673 100755
> --- a/features/bootchain-waitdev/data/lib/bootchain/waitdev
> +++ b/features/bootchain-waitdev/data/lib/bootchain/waitdev
> @@ -20,5 +20,6 @@ while [ -n "$devspec" ]; do
> break
> fi
> fi
> +
> sleep 1
> done
> --
> 2.24.1
>
> _______________________________________________
> Make-initrd mailing list
> Make-initrd@lists.altlinux.org
> https://lists.altlinux.org/mailman/listinfo/make-initrd
>
--
Rgrds, legion
next parent reply other threads:[~2021-10-26 9:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-26 9:20 ` Alexey Gladkov [this message]
2021-10-26 9:51 ` Leonid Krivoshein
2021-10-26 11:14 ` Alexey Gladkov
2021-10-26 17:31 ` Leonid Krivoshein
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=20211026092039.qbp5trecvufr7ve4@example.org \
--to=gladkov.alexey@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