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=9v/G+86f3sAWWIEPBCp4D2ecUD4VzjIiq0ZO1lRe/eg=; b=EbgwsKt/2mWLxXGy/7+tCiP4GfMp7e4jN1Gniy54VKoQupWwyQzEvLycNa/F0TJnhE Llq0bjWVzkgLX6sJN6aKy9fiFgkARuA+TbwUV4VoW2uuAJ2RAE58u2jBKK9nYuy65g0x oURTINxgHKWS9H5U5Kt+0MXrTMOUMDJ1BcyZVlCpO7maS/64F2R+JNj3+5EzdA6R0KA7 UdsoqDPYY0NhinWw/z0YR9GosTVVE0qsN5KD8+PfOIO+lTbikqcf+hBVULdNzlFZ/mlV y88W631QE65qDGCwGESEg28t9Y/wyW5uP4yxSCUnMQYsjp8qt8hxI9FLrrHTM7HrQEPQ v/Qg== 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=9v/G+86f3sAWWIEPBCp4D2ecUD4VzjIiq0ZO1lRe/eg=; b=Yel5Mqgtty+RCgrulDicQiIa1OK53HEigk172G12grOym261z/oyDVM7S7sVmC5nCG KXU/zF0eYBMDtaFGkKDhPCiIPsbw9rMsRnmy83Zz+mF1zq/D4g9nxzC7YzW5LLKG73ry 856RYLHHNkb9SRQFVVxT1L6dOg2jeqRLanqVSmZ6VBMT268dDYuK2SUU0tF2AxZuqZbL hV5PlNHEfnTE6QSKZiLb5sXlWFS+GpQfu6r0no1Feq8ZT1VZTKnwZigqGcmux6G+Nn5Z dsAVC3yzxS1+BeNZQr7IP0jPBgAAmBxuV7S4+kCmAmHcMmD+uHXl/9PRtXRWKN9fRPSd T5GA== X-Gm-Message-State: AOAM530Nb+RgwkBqo8yLR4oQElq2ue6P6JVB4uSRiBnv89koOMJUN/93 l03rgIknvO2a4rYt58CHlcfAar/p9is= X-Google-Smtp-Source: ABdhPJz306ZKbmEQDYf2ovyZ7QlgvOXYDdWdc3itk7CaaDC8QJdrcV4v185hRC54c090F04BZWUaiA== X-Received: by 2002:a05:6512:12c6:: with SMTP id p6mr9887719lfg.271.1632499151325; Fri, 24 Sep 2021 08:59:11 -0700 (PDT) From: Leonid Krivoshein To: make-initrd@lists.altlinux.org Message-ID: <95ad7420-a92b-aeab-8068-193c6b4d3ac4@gmail.com> Date: Fri, 24 Sep 2021 18:59:10 +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 35/41] fork pipeline: bootchain-loop: added switch to foreground 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:59:14 -0000 Archived-At: List-Archive: --- .../bootchain-core/data/sbin/bootchain-loop | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/make-initrd/features/bootchain-core/data/sbin/bootchain-loop b/make-initrd/features/bootchain-core/data/sbin/bootchain-loop index 7474ebb..9d15781 100755 --- a/make-initrd/features/bootchain-core/data/sbin/bootchain-loop +++ b/make-initrd/features/bootchain-core/data/sbin/bootchain-loop @@ -5,6 +5,7 @@ stepnum="${stepnum:-0}" chainsteps="${chainsteps-}" prevdir="${prevdir-}" +BC_IM_supported= debug() @@ -14,12 +15,40 @@ debug() } +if has_feature bootchain-interactive; then + . interactive-sh-functions + + [ "x${1-}" != "x--foreground" ] || + IM_activate "$BC_FGVT_ACTIVATE" "$BC_LOGFILE" + BC_IM_supported=1 +fi + rc=0 while [ -n "$chainsteps" ]; do name="${chainsteps%%,*}" exe="$handlerdir/$name" - if [ -x "$exe" ]; then + if [ "$name" = fg ]; then + [ -n "$BC_IM_supported" ] || + fatal "bootchain-interactive feature required" + assign "callnum" "\${callnum_$name:-0}" + chainsteps="${chainsteps#$name}" + chainsteps="${chainsteps#,}" + + if IM_is_active; then + message "[$callnum] Step '$name' has ignored" + else + message "[$callnum] Switching to foreground" + + callnum=$((1 + $callnum)) + assign "callnum_$name" "\$callnum" + + export stepnum chainsteps callnum_fg prevdir bcretry + + IM_exec "$0" --foreground + fi + + elif [ -x "$exe" ]; then assign "callnum" "\${callnum_$name:-0}" datadir="$mntdir/src/step$stepnum" destdir="$mntdir/dst/step$stepnum" -- 2.21.0