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=V/oTw/0BXXeHAtiMylIsQD8LLb/H9RAWQWXNUANdNfI=; b=SbuI/LC1j6UaJKf2CKUgkczF9mYOVWrrvvkdbYnsdnMVwdbnaAgqxLCBGGq/m8mhlE aNf+yV1b9eg2FdHiQHY/bbFcPaAa6caoRPr7+o7ChmHOMZ11i8HoFc1D/aKqAt8kjB0Y hb9/HrD+wuXO/TqCMV9Pm5YETeXKEZaI7G1OKsS2ARu614g+xMlV3/6CG8qyylXqlox+ qEkTspqqRKHc5frsC7SVVz8au3YYecBuHknqaCop3zc4njVQOEmFmBkeTtq2uA1oS9hs 45MWKhWqn9Umoe1Beyj00UYDF8EpYpy/msXyxP0XXGBOUCMwV6Y/KG9afLVx/zzG3T1e kDtg== 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=V/oTw/0BXXeHAtiMylIsQD8LLb/H9RAWQWXNUANdNfI=; b=79F5g/DASOyoY8g+qAIBConSYWUkg+1y5lppFrtj1krJMyyaSVsSJeUNtKoipyspt2 hXQEucNXQTi8O4peHjOhYyLItLh0bZiI8ndd3kIAZunG+/s1R8RvUQ4zFM6+tdnYzT/U 93tSjY3QptwcNCwKA1CH+zjFE9wn00ElDInryIoJ6ahHsDutWJbaqk/aojby+/U49AJu Kpex0bidfeJyV8XwPKHHq3u37HRTAhN9gXmiTYfQFQVc+6grSrkJtsXukm44BoURaslg jt5RrVS3nhOGaSGYTczmEhvpC7k2r3WUZAbLY/D6o4aekfC2+2WPM8qCpVbfxlwo927W lMCw== X-Gm-Message-State: AOAM530b/Mz9IrJ4pUaeCRoISrU8hyTCfFbpey9Zsj42kjc9IMvlt/xC naxHsJl8IEe3JPGai0OH5Y5y6z2S5yw= X-Google-Smtp-Source: ABdhPJz7Jq12iQKekd+FSbRJEmnN2Dwke3G1V2zBkJI2w4q+5SMdKd+4YxjfwGDnVMdaicSdbHKcdQ== X-Received: by 2002:a05:6512:3f18:: with SMTP id y24mr2590937lfa.263.1632499145745; Fri, 24 Sep 2021 08:59:05 -0700 (PDT) From: Leonid Krivoshein To: make-initrd@lists.altlinux.org Message-ID: <89990162-6292-bf7d-bb1b-41bf781249a6@gmail.com> Date: Fri, 24 Sep 2021 18:59:04 +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 34/41] fork pipeline: bootchain-loop: cleanup, testing and debugging 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:09 -0000 Archived-At: List-Archive: --- .../bootchain-core/data/sbin/bootchain-loop | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/make-initrd/features/bootchain-core/data/sbin/bootchain-loop b/make-initrd/features/bootchain-core/data/sbin/bootchain-loop index 70a5bf6..7474ebb 100755 --- a/make-initrd/features/bootchain-core/data/sbin/bootchain-loop +++ b/make-initrd/features/bootchain-core/data/sbin/bootchain-loop @@ -94,3 +94,39 @@ elif [ "$rc" = 0 ] && [ -f "$BC_PASSED/$PROG" ]; then else fatal "daemon terminated incorrectly (rc=$rc)" fi + +if [ -z "$BC_DEBUG" ]; then + grep -qs " $mntdir/" /proc/mounts || + run umount -- "$mntdir" && + run rm -rf -- "$mntdir" ||: +else + prevdir="$(readlink-e "$destdir" 2>/dev/null ||:)" + [ "$prevdir" = "$rootmnt" ] && datadir="" || + datadir="$rootmnt" + destdir= + callnum=0 + name=STAGE2 + + message "[$callnum] Handler: $handlerdir/debug" + + export name callnum datadir destdir prevdir + + run "$handlerdir/debug" ||: + debug "last step finished with exit code $rc" +fi + +if [ -f "$BC_LOGFILE" ] && [ -n "${BC_DEBUG}${BC_TEST-}" ]; then + if [ -d "$rootmnt/var/log" ]; then + destdir="$rootmnt/var/log" + else + run mkdir -p -- "$mntdir" + destdir="$mntdir" + fi + + if [ -n "${BC_TEST-}" ]; then + debug "test '$BC_TEST' in the stage1 passed" + echo "$BC_TEST" >"$destdir"/BC-TEST.passed + fi + + run cp -Lf -- "$BC_LOGFILE" "$destdir/" +fi -- 2.21.0