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=DSmJTZf03ipSVKhn812Ua3xi0sh34sY/BJwPWDv8Dwg=; b=GM4BqJ9PkA9pJl/Ypfh2PZoa+BDo2Zl8mwRg7woV2bIuDqaFZWIr9TYcSxWCGnoEWx /Wk0l3nlObNWKqQDSTUC2iEZ8ZDAhtxh3JOUAXiwd4z20L+E0W0C6oxjzTfdPldeHqWd nEDGvvZDhCa01wDr6kp0IuEZ6KIowhEx2BipmBBEFrHdPDP/FM+4SOtLcuC36Qa5nHzF vCFZL8KMNFPewqYFVF8EO1oEoLJMSB2N81EJLeohrr2qVEAktH3P+pL68XwU7JHKGLN4 ZPUjm+KaqvHtbqatPjW/Y6M04PELdyXQVHjdEiBqLI68NXntAD7vBC0iE+4cgtbc5rcN Avkg== 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=DSmJTZf03ipSVKhn812Ua3xi0sh34sY/BJwPWDv8Dwg=; b=YUxefUmE2+rgddGhY0gHIitW4Jw2CMHPizh8ZuEbpIOdeTV6URc5eGImsxphmQvrOl aTUg+ABHQf5IG9zWo9oSLoJenC94Hv30lE0KZTqgjiTcrafedmBPmTJY0FNHs+7RV5Vv 2HOv0XttOTINaUMCJoy64SNFTQuDiHkcJJHl+y6Bfb7Of7P2X19jmrMXZ0EihowUMUsh cOddwGeE5lzkADHgd6F50lB1l/6b8ppVDF917Szpl9Gd1IPYLzmiC4wj4WGJD4D4+FuY GwsE+Z+H5UD1a5Cs2LIHYaUwfFK5pTbL98TLxFR4vFVU6pzfm85Fq3qPec/AnjC4+aWX 2Nzg== X-Gm-Message-State: AOAM531JLlXiL8ZCbIsJM1foHYw8Phj9R6pbccVPE0L2/FUIKYNP70AM 69nqFtAG3Eh+Enbs+KIcZ0l8MMDYMRU= X-Google-Smtp-Source: ABdhPJy5m0hONx00T6uo/jJ4PxKEKSxEcPLqp4irJS60WIR1yhKfHlqDLnK7zqz1WmGgx0CKgkaGXw== X-Received: by 2002:a05:6512:3f13:: with SMTP id y19mr9744345lfa.211.1632499109436; Fri, 24 Sep 2021 08:58:29 -0700 (PDT) From: Leonid Krivoshein To: make-initrd@lists.altlinux.org Message-ID: Date: Fri, 24 Sep 2021 18:58:28 +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 29/41] fork pipeline: bootchain-sh-functions: resolve_target modified 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:31 -0000 Archived-At: List-Archive: --- .../data/bin/bootchain-sh-functions | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/make-initrd/features/bootchain-core/data/bin/bootchain-sh-functions b/make-initrd/features/bootchain-core/data/bin/bootchain-sh-functions index 6a20c4c..35cee1e 100644 --- a/make-initrd/features/bootchain-core/data/bin/bootchain-sh-functions +++ b/make-initrd/features/bootchain-core/data/bin/bootchain-sh-functions @@ -24,20 +24,29 @@ 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}" + ;; + step[0-9]|step[0-9][0-9]|step[0-9][0-9][0-9]) target="$mntdir/dst/$target" ;; *) if [ -z "${prevdir-}" ]; then - message "no previous stop to use" - return + message "no previous step results to use with $PROG" + return 0 + fi + if [ "$target" = DEVNAME ] && [ -s "$prevdir/DEVNAME" ]; then + read -r target <"$prevdir/DEVNAME" ||: + else + target="$prevdir/${target#/}" fi - target="$prevdir/${target#/}" ;; esac + printf '%s' "$target" } -- 2.21.0