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=/XLB0jdstzgsmUMwWh4+R2uYqwmAqcjufM4cf/SKvRQ=; b=T9/RyD4SBpf3PhjSF18IWJ5fEDzSqhmoaEK3dD6aQRmRUSB94dS+qhApBoMYkEvVyX Dx4KD3754/NpazzYpgy+IYY5SqlXP/LbPerNLWo6kU6oqv7t/0iy1Xgju9T/Su2X63Ci avFiVe7JhVPvlFV1OHka+v5r1RDV9MXSqgEGe9UuzLPUsvxIKGUrfvpAz6/v2dzEBI/E qBrYaN1w/6IaNmkW98ASY3WKrR3kwT7txCpj/NyseFrD/sn+fkUWDD5xvAyFnvqQQOaV 4ePdI6tvMnvKvc3geTUseHx+xvleOr8S+4b5VaH6IsUcMgR0qduZEwSgBCV6AHw68DNu aiIg== 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=/XLB0jdstzgsmUMwWh4+R2uYqwmAqcjufM4cf/SKvRQ=; b=LfX0HlIKuJXz4mKl5msSevXsSHEjpZKBA0bMLUWy+r6as2sxaqRHe4ZhOt3SlMfRFm tFWTwbiOxug8+IWlMkwjGALlx//yXdzoh72WfFSmx6fhEyrXwUImZLALMfmYh8evXCg8 NTzaBUSdJz+fJkAmtw4wsBM97FFclbSK5mP7rNPXjcA3xms2ln0mNj/3aFdpBN8EgzOW j0GJCeOJ6oXCP46lhINf84B9x3w5nHHaMsdDUwSvWi8hw7sT0gdmA4rqu4xuTQBNXt5j RYlMwSPAA0xOAMS9WAbvsCXeMWbDX5hqqjQt9l0dzUkyRhPf4rQ4925tnVLMThMqAtAR Tijg== X-Gm-Message-State: AOAM531aVm5MKaX5upAbIiFTEWB62gtBthK5qYN/mBB18sPXTx+6u/5T 1BBsPPLqLF0wXxIeZipqSVfr/z+fGGQ= X-Google-Smtp-Source: ABdhPJysk5GetDX2lvUSN9SN2i/BHXDjHPro6rHil0ZFn9WfrLe7zNCfgsLH+V5C0mnB+wZVzUJTPw== X-Received: by 2002:a2e:95c4:: with SMTP id y4mr27161178ljh.0.1635269516525; Tue, 26 Oct 2021 10:31:56 -0700 (PDT) To: make-initrd@lists.altlinux.org References: <20211024172039.D6F8EA5E4C@lists.altlinux.org> <20211026092039.qbp5trecvufr7ve4@example.org> <20211026111429.y3m2lce3riyosddd@example.org> From: Leonid Krivoshein Message-ID: <579a371f-6c91-b466-e5d2-b6953992a84e@gmail.com> Date: Tue, 26 Oct 2021 20:31:54 +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: <20211026111429.y3m2lce3riyosddd@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 17:31:59 -0000 Archived-At: List-Archive: 26.10.2021 14:14, Alexey Gladkov пишет: > On Tue, Oct 26, 2021 at 12:51:14PM +0300, Leonid Krivoshein wrote: >> 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 и >> так будет понятно, что это старый код. > Оставь пока так. Просто в следующей версии выкини этот коммит. OK >>>> 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. >> >> _______________________________________________ >> Make-initrd mailing list >> Make-initrd@lists.altlinux.org >> https://lists.altlinux.org/mailman/listinfo/make-initrd -- Best regards, Leonid Krivoshein.