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=tEykEXeGClkuCsnfi4ji3pZLi0NcOCudBrNfcPkROhY=; b=mBSpZsFpj1SZ0fikweJuybTQNIXSK1czLRYY8KXqDJxrsGCzuF6BXVT5T7yJfhKjGo UYVyTmBEFUbrQbdaJ/2FvcbF7UQWKUNNAsT2ni7Z/APTIYrdzDHz9N0QM5l5zMN3zjRK uPmDpejABI1Yx/VuTteK/BRm8y192RyLgsGdoxE9TeiiVWr81SMIP0dG5qT2SNfAQPq6 NJbttEkgFMzYghQqgYo4oAVaBaEdgBkOJSzb+uSHp/0/GO4hnhHp+N0R/hzcXFyeeOsK 2AK8zO7YC9AEaoRHl5LQqqafFXlueq94WuTaj1m7CH7WwwwnslG2ck+YZbPg9jhB3rAq fNRQ== 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=tEykEXeGClkuCsnfi4ji3pZLi0NcOCudBrNfcPkROhY=; b=1ZzD1bK9BVYiuWutlAI6bxZ7wOl4LqC8i/nQsMI86i19ggOBmNvSzod5JMQ20l+S63 OItQ8/4G8OPZ0lkQ98XPdppJbMnC09G1OwWq2obhCFOyr9SgaQqm+JcQE4LgCV8ujlZ+ XM4ttamw70P58zUV1++Rj33LVQHt5jaNxRFLEoFHxn1ljomPn7J8ipM0pIv43Uj/5uPH dsHsnPpB8IzgSzGmR6bu2c6DVwOCcOKqBAaD93kIUihp7Fjve2pMo9oe7P+W0S2LR071 hXWVVbEzJ6qGn36S/bk4ZtFF/ffgU+LGv5b3loPgMX8bTeUP74nHPqC0tVd5niPh0YZU DpEQ== X-Gm-Message-State: AOAM531tko59WVfAJNKXVWycXeGQLOCRc6FZNP1RRFTq5a0x863AdkW3 tQtmS4vFVkwBC04PNRzfA7dNGHLbbng= X-Google-Smtp-Source: ABdhPJz5vcWMjBPULVsaarubWHO6SAacqTXBXASWOVhRG1dNYYjC8Hv/WuylPaNgYvmGaHsNQgsvXQ== X-Received: by 2002:a05:6512:a82:: with SMTP id m2mr5769381lfu.212.1635247734134; Tue, 26 Oct 2021 04:28:54 -0700 (PDT) To: make-initrd@lists.altlinux.org References: <20211024172128.744EFA5E4C@lists.altlinux.org> <20211026111221.2bay4wh2xfvxq2vr@example.org> From: Leonid Krivoshein Message-ID: <5fea746a-25c2-01ee-3403-ed4a4815968f@gmail.com> Date: Tue, 26 Oct 2021 14:28:53 +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: <20211026111221.2bay4wh2xfvxq2vr@example.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: ru Subject: Re: [make-initrd] [PATCH v6 10/22] bootchain-core: expanded addressing capabilities 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 11:28:56 -0000 Archived-At: List-Archive: 26.10.2021 14:12, Alexey Gladkov пишет: > On Sun, Oct 24, 2021 at 08:21:28PM +0300, Leonid Krivoshein wrote: >> Adds support for reverse addressing relative to the current step, >> as well as calculating the path to the special device node obtained >> in the previous step. >> >> Signed-off-by: Leonid Krivoshein >> --- >> features/bootchain-core/README.md | 6 +++ >> .../data/bin/bootchain-sh-functions | 37 ++++++++++++++++--- >> 2 files changed, 38 insertions(+), 5 deletions(-) >> >> diff --git a/features/bootchain-core/README.md b/features/bootchain-core/README.md >> index 8d341e0..ba66259 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. >> +- Via resolve_target() supports not only forward, but also reverse addressing, >> + relative to the current step. For example, a record like `step-3/dir1/dev` >> + will process the result of `dir1/dev`, made in the third step from the current >> + one. Together with the overload of the chain of steps, direct addressing is safe >> + only when storing the numbers of the completed steps in files, whereas reverse >> + relative addressing it is safe in any case and can often be more convenient. > На мой взгляд очень непонятный синтаксис. step1 и step-1 кажется > одинаковым. Хотя бы current-1 OK. Давай переделаю так: step = pipe -- прямая адресация, так первоначально и было. curr- -- обратная относительная адресация. Так будет лучше? > >> - Allows you to work with shorter and more familiar paths to special files >> devices thanks to the use of `DEVNAME` along with `dev`. >> >> diff --git a/features/bootchain-core/data/bin/bootchain-sh-functions b/features/bootchain-core/data/bin/bootchain-sh-functions >> index e73fd35..0eebbaf 100644 >> --- a/features/bootchain-core/data/bin/bootchain-sh-functions >> +++ b/features/bootchain-core/data/bin/bootchain-sh-functions >> @@ -27,19 +27,46 @@ get_parameter() >> resolve_target() >> { >> local target="$1" >> + local where="${target%%/*}" >> + local n="${#where}" >> >> - case "${target%%/*}" in >> + target="${target:$n}" >> + >> + case "$where" in >> '') >> ;; >> pipe[0-9]|pipe[0-9][0-9]|pipe[0-9][0-9][0-9]) >> - target="$mntdir/dst/step${target:4}" >> + [ -d "$mntdir/dst/step${where:4}" ] || >> + return 0 >> + target="$(readlink-e "$mntdir/dst/step${where:4}")${target}" >> + ;; >> + step-[1-9]|step-[1-9][0-9]|step-[1-9][0-9][0-9]) >> + case "$destdir" in >> + "$mntdir"/dst/step[0-9]*) >> + n="${destdir##*/}" >> + n="$(( ${n:4} - ${where:5} ))" >> + ;; >> + *) >> + return 0 >> + ;; >> + esac >> + [ "$n" -ge 0 ] && [ -d "$mntdir/dst/step$n" ] || >> + return 0 >> + target="$(readlink-e "$mntdir/dst/step$n")${target}" >> ;; >> *) >> if [ -z "${prevdir-}" ]; then >> - message "no previous stop to use" >> - return >> + message "no previous step results to use with $name" >> + return 0 >> + fi >> + if [ -z "$target" ] && >> + [ "$where" = DEVNAME ] && >> + [ -s "$prevdir"/DEVNAME ] >> + then >> + read -r target <"$prevdir"/DEVNAME ||: >> + else >> + target="$prevdir/${where#/}${target}" >> fi >> - target="$prevdir/${target#/}" >> ;; >> esac >> >> -- >> 2.24.1 >> >> _______________________________________________ >> Make-initrd mailing list >> Make-initrd@lists.altlinux.org >> https://lists.altlinux.org/mailman/listinfo/make-initrd >> -- Best regards, Leonid Krivoshein.