From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM autolearn=ham autolearn_force=no version=3.4.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding:content-language; bh=dT0Ny3/Y8ZOS+pQ77vw51Glpq19w30X3xtQe2E1+rNw=; b=exmovBlLgnWlBnBjw1vktRgTBFVdV79EA10ncwkHSfkdsL9cnL6tlq9RKfkGvRl6mb WVeXz4aUe7+4O8+TRxNjc543QKVm04AJFr4XcpABcuVjHmXOanHH4Y0XyrdcVvCThsUN aAlNzrLGPvzHBwvHyqWDtCkd4cIh4BhusLHrF3QEAfv7lZCVIL59jBE1vj7zHZSltkYV 8PAwb3WkbuFtmsXHZZqa1g9JYhRER2g6ipyLNLYs+ybCFW5z7bjTOFhgFZqiyqSqxEhg rMEl3bd0vP0G7rCC1ugE+8Yac9w+kqR/T0+6FWNNUtPgs98JIrUDw+KCNqJTa3BAS4C4 Bajw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=dT0Ny3/Y8ZOS+pQ77vw51Glpq19w30X3xtQe2E1+rNw=; b=sr/JmX8SDlt3ngufmRBGyb40ReNQwgnMh6wnYLDq3m3/2o6fyP9xwWYodEVHfST+fk BX/aQI/mH6fgqsBk142VMn0FxJlordE9xv10WvEs4OE4EhnmqazpnTVISvq14hAXnpsL CHvjo44xiXgMo7BnFZOZvMkHTjuY1Klni9HX+wzcmCq1dX/Q0p5ndjUSnRIKAkIocScA 8I/jbnIBlDLCFdZFvuGCylfj4/V8F+YAb7+nAJpiX5JSeYFTKa/e+6VF4fuhsaVDdRhc wTX5ozr8Ky40/h4isEqjdsiNZBKJNJj+8dli/F4rT8OBcVEFHQy2cd4bCIPVqQaPx4xC o7dg== X-Gm-Message-State: AOAM531qtBA3fLcSMbalcK6PJqgKJPfb6UI90+LaQQmSf6YpA5u7x0Ab SZ9fQgM17D4FJN1KmUcIsCiyynF+rBY= X-Google-Smtp-Source: ABdhPJxRqVTcb4E0fiF6QG9uzWZn8v6+elnd8NWFjoPvkCSgdWC4SE/7Wm8CvKDtW0XK078q5URKpw== X-Received: by 2002:a2e:bc03:: with SMTP id b3mr25254404ljf.54.1635241875193; Tue, 26 Oct 2021 02:51:15 -0700 (PDT) To: make-initrd@lists.altlinux.org References: <20211024172039.D6F8EA5E4C@lists.altlinux.org> <20211026092039.qbp5trecvufr7ve4@example.org> From: Leonid Krivoshein Message-ID: Date: Tue, 26 Oct 2021 12:51:14 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20211026092039.qbp5trecvufr7ve4@example.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: ru Subject: Re: [make-initrd] [PATCH v6 05/22] bootchain-core, bootchain-waitdev: whitespace X-BeenThere: make-initrd@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: make-initrd@lists.altlinux.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Oct 2021 09:51:18 -0000 Archived-At: List-Archive: 26.10.2021 12:20, Alexey Gladkov пишет: > On Sun, Oct 24, 2021 at 08:20:39PM +0300, Leonid Krivoshein wrote: >> Signed-off-by: Leonid Krivoshein >> --- >> .../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=$? > А это вообще ошибка в форматировании. Переделаю. Да, здесь whitespace слишком преждевременно (#05->16) для уменьшения diff. Вопрос в том, как лучше переделать? Сделать отдельный коммит whitespace перед коммитом, где тут ожидается изменение (#16), или чёрт с ним, со сдвигом? Просто удалятся и добавятся две строки, по diff и так будет понятно, что это старый код. >> 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 >> -- Best regards, Leonid Krivoshein.