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=from:subject:to:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=065xWH27EAlya0AqSHvy93c3cDw67k6JjLcWDxUq9So=; b=MZsROouuQQ4y0ovguATUQ7ynpevnXAuV/qKr0o3aR1twx6LKsKu7dh+mt0Clm071qi uVNYFumXe1DF0mdB+4HijnkRToJ/I10T9Hg1SeQSAcjmH8N2ryV97Lew5jFKfqN8DVY+ rxWg1HuL0ZNB5LuI2OZBSjbr5N0OZvcR3BSough1/WowX18Yqc0d4yZxBEgOXLmj6UI7 +PRvkQrbn8YPHkCo1K71G6M/5i6OyjQVf8NjZtjK/Z55ym7BIN4pJ+2RqdN8n3tSJ4SB His6meSQ0+7Ia44d+lZGFRIu+oDgguNrZiahGzVa0ZOK5IMAUrAsFqm7Wv3z9iMW7n6H kZ6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:subject:to:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=065xWH27EAlya0AqSHvy93c3cDw67k6JjLcWDxUq9So=; b=AHSCn0Sijkc9jK5DvxgLhrorBWE4aqZkhdaGJhaQaAkgGxfhmBOFgPKRKjt7qtiwiu 9PVEhxVCK65MJEJEnPFfKqoCLM49OUWWqPG2yR0FifljFYGNtBVnpuCSqOFmiT0Ji42T /eQoM+a8NdvtmvAr24mAZ8rlap28gC41eUDjN9IqH87rXsJYwfAi4/fQ8oH+m1ZK0iA0 Slgza9Ekqg7b3mYMuibFfLHL2nKAk5fIafWkqsn0WoPhibk9EuqLxty46gPG8i8bcKod 1gR593c7nBZl0Gf0nLpR4OJwfnipE9Z82fI6UFFlu+mZkZRPnke6H7o6Y7GrUe90iOrS RITQ== X-Gm-Message-State: AOAM530OkF9y0T8wddrJ5cAQwG5tk72YOCXKWdIYr05NCgazNDpHmsNJ he0xgRj/EJVSkaZoswt9F/KaPQepmc8= X-Google-Smtp-Source: ABdhPJzMq8Vli+GsjclpVMcFgO+6UbNZgckxQzBv2w99LnBufp1M+0KOn0YZkSqvj8V/O113XRJzVA== X-Received: by 2002:ac2:5978:: with SMTP id h24mr10014053lfp.426.1632499125523; Fri, 24 Sep 2021 08:58:45 -0700 (PDT) From: Leonid Krivoshein To: make-initrd@lists.altlinux.org Message-ID: <4d61352e-5106-dfbe-37ff-b68c02445395@gmail.com> Date: Fri, 24 Sep 2021 18:58:44 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=windows-1251; format=flowed Content-Language: ru Content-Transfer-Encoding: 7bit Subject: [make-initrd] [PATCH v1 31/41] fork pipeline: bootchain-loop: pipenum to stepnum renamed 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: Fri, 24 Sep 2021 15:58:48 -0000 Archived-At: List-Archive: --- .../features/bootchain-core/data/sbin/bootchain-loop | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/make-initrd/features/bootchain-core/data/sbin/bootchain-loop b/make-initrd/features/bootchain-core/data/sbin/bootchain-loop index 7f2e0fb..3775f84 100755 --- a/make-initrd/features/bootchain-core/data/sbin/bootchain-loop +++ b/make-initrd/features/bootchain-core/data/sbin/bootchain-loop @@ -1,8 +1,8 @@ #!/bin/bash -efu -. pipeline-sh-functions +. bootchain-sh-functions -pipenum=0 +stepnum=0 pipe="$PIPELINE" datadir= destdir= @@ -14,10 +14,10 @@ while [ -n "$pipe" ]; do if [ -x "$exe" ]; then eval "callnum=\"\${callnum_$name:-0}\"" - datadir="$mntdir/src/pipe$pipenum" - destdir="$mntdir/dst/pipe$pipenum" + datadir="$mntdir/src/pipe$stepnum" + destdir="$mntdir/dst/pipe$stepnum" - [ "$pipenum" != 0 ] || + [ "$stepnum" != 0 ] || prevdir="" mkdir -p -- "$datadir" "$destdir" @@ -50,5 +50,5 @@ while [ -n "$pipe" ]; do pipe="${pipe#$name}" pipe="${pipe#,}" - pipenum=$(($pipenum + 1)) + stepnum=$(($stepnum + 1)) done -- 2.21.0