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=uWZVWbe9sD3hHjnsJIcplKGWZM3iTFBF1RFrmE4iWXQ=; b=Lkt3I4LGgZRw+6fNEPTR+GOpqMovKICIFliH+uOeKw9bUjn9w0aVb5UzIBuAQ0IkiG +Jm5vdQI8jGb83Mp9tyTgN+J4SDYqcl1bzpwqqK1S69Em1UlauTwgkrUbcc67+5ha7oX FJM4trCA+83iUpEtlVYdxZBqtsL72WU2Ls7Y+bqjGB+6OlzbDMkJI9HV9jLoy1UAoCDm VbWUJIJyujz5nabg0Uqo7ZscdkKt//WIeixJ/joT4NV7gKg9LVRBTJXt+ZTYUzq8wJr0 YIIP0hh5z3SkFfoymHzhKCgDCWf5gYtgDoonk7CgJi88rZWaEhauvxoKcXvc0g17DvXM bQBg== 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=uWZVWbe9sD3hHjnsJIcplKGWZM3iTFBF1RFrmE4iWXQ=; b=TtHzWv3Pqo4ElB6onjN0Am24LZZN/cp2EqqDk19MOyK3cwHVdxny8RNnYgv9K1C4ek HdZv+rti89Bqrcg6TE9wXcOJ3IC4n6t3aGe24dyR4QTsA5/hbQs78AgW/L+T6B8u5Xrp odX6X3xWvsRpW4JRa9bAapBdpcgqzXIqL8PNddH+Ah7y477UOOTJhvRCPtQld9Yo/GB4 6ICnyIqFQD3gjkkHxJ4CRlZO+8+kf/zgJnq+iOoHhd91kwFjrf8OvE3RAg1W0q0ne37Z fJIx22QROkilOHPbOZGQIF9rdHsx54kxh6mFAgGOqLEGX3DpAFJ2V5sXQ+k04TcOZ21O 7hqQ== X-Gm-Message-State: AOAM532f8nqPFtM7rebTKQZNP3kVqoBpkbFszEyNrlK6LVoIKrK3epVg tNtNuHx9KzRkEMfCLv5+EF6KWpYOi6o= X-Google-Smtp-Source: ABdhPJxj6mKdrtMYKIqhcRJpc0D/ieSb1jCQYy+cvzbj5k4RygvCZdUymEg/xflGYwqYmSvpSJkorA== X-Received: by 2002:a2e:461a:: with SMTP id t26mr3530065lja.198.1632499096068; Fri, 24 Sep 2021 08:58:16 -0700 (PDT) From: Leonid Krivoshein To: make-initrd@lists.altlinux.org Message-ID: <9417a793-7463-91f8-c14c-398233116c53@gmail.com> Date: Fri, 24 Sep 2021 18:58:15 +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 27/41] fork pipeline: bootchain-sh-functions 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:18 -0000 Archived-At: List-Archive: --- .../bootchain-core/data/bin/bootchain-sh-functions | 13 ++++++------- 1 file changed, 6 insertions(+), 7 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 07a059a..5c5a9fb 100644 --- a/make-initrd/features/bootchain-core/data/bin/bootchain-sh-functions +++ b/make-initrd/features/bootchain-core/data/bin/bootchain-sh-functions @@ -1,13 +1,12 @@ #!/bin/bash -efu -if [ -z "${__pipeline_sh_functions-}" ]; then -__pipeline_sh_functions=1 +if [ -z "${__bootchain_sh_functions-}" ]; then +__bootchain_sh_functions=1 . /.initrd/initenv . shell-signal -handlerdir="/lib/pipeline" -mntdir="/dev/pipeline" +handlerdir=/lib/bootchain check_parameter() { @@ -44,8 +43,8 @@ resolve_target() run() { - [ -z "${DEBUG-}" ] || message "[$callnum] RUN: $*" - "$@" + debug "RUN: $*" + "$@" || return $? } -fi # __pipeline_sh_functions +fi # __bootchain_sh_functions -- 2.21.0