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=h8WQNgiBz7OltsjQ26LED+KuJD0l/cKGcrQHo35NsM0=; b=nc41CQ4imIY964jMeYEc8Pv2imShRinyhW3W1f7G33nug3W48cyfwMVJucYG5uSFyg h94npOSb0Xlc3OY6TwqcAm7FRatmR0Z9a0iVKfTQ8HsSHakH9BaJkqAEPQCWMulJxxBh pgdsD4ZuSauUalyCePkpQ4CMv40d41AL4tvSX28i111f3Sfs84qiKQFwQ5i2mBt5CE4T 170NkoN4guagn5k3VxO4jaLiD+RTdGqQ88kjzHsfNir0Vczd835kOMSZApgXZY674vU0 QecmkNf5aiob7PeYXH2h4oXWC0wjNXiyuXgthJcS5MkU3HFLyPc3cWykCOrudj2kl11O JxKQ== 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=h8WQNgiBz7OltsjQ26LED+KuJD0l/cKGcrQHo35NsM0=; b=jH4ElXaIpC/azMEoDhoM8WNl9W+wObH2kZq7w/AcU/Vc3xUnIUrEDtLFzIpaji/G5H xwumFuET/Oja7Xi9OIcMdDeazFjzNGK3Z55KsE/YxSnl0mo+BsGwkYCfFs6XxSUCBguJ izGhXdzxuXpwX4HTy+c0MI7f2VFW/RmJL89+4gu9KkYU4tIOoYoFibwVH1OlFnhUbcaz YRQhQDE0/FPSzvWjO3xgldYB22u2jAXdYhXM4V9Q3obiYDlX6B3wnLQ1umsBb1uprAdl fULMb0DOphNpv4njNfgqE/QfMLP53Zagdq0wbGIwEqwKSQKlPeDC+vi0jrkVvCH+dvwL R4iA== X-Gm-Message-State: AOAM533nV1THq49HA7/qIb86np/nes7vIeRS4gP9gaU7P+MA9uNnM+Ku sBbowE/3l6FwJuU4I4/Eea0kT0ohTfA= X-Google-Smtp-Source: ABdhPJzZU8z6UzTXmeuxdeNI6kjw8VaKKNWiaEfuXddPBEL55B+F6cD3aJpok1cd53dpCNgKjjchwg== X-Received: by 2002:a2e:6e08:: with SMTP id j8mr11537893ljc.247.1632499086669; Fri, 24 Sep 2021 08:58:06 -0700 (PDT) From: Leonid Krivoshein To: make-initrd@lists.altlinux.org Message-ID: <56f95272-9b57-57e4-7162-16652b00f182@gmail.com> Date: Fri, 24 Sep 2021 18:58:05 +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 25/41] fork pipeline: bootchained 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:11 -0000 Archived-At: List-Archive: --- .../bootchain-core/data/sbin/bootchained | 41 +++++++++++++------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/make-initrd/features/bootchain-core/data/sbin/bootchained b/make-initrd/features/bootchain-core/data/sbin/bootchained index 369938a..7a1843e 100755 --- a/make-initrd/features/bootchain-core/data/sbin/bootchained +++ b/make-initrd/features/bootchain-core/data/sbin/bootchained @@ -1,38 +1,55 @@ #!/bin/bash -efu -. shell-error -. shell-signal +. bootchain-sh-functions -message_time=1 pidfile="/var/run/$PROG.pid" -logfile="/var/log/$PROG.log" + exit_handler() { local rc="$?" trap - EXIT rm -f -- "$pidfile" + wait exit $rc } +debug() +{ + [ -z "$BC_DEBUG" ] || + message "$*" +} + + +# Entry point [ ! -f "$pidfile" ] || fatal "already running" - set_cleanup_handler exit_handler echo "$$" >"$pidfile" -. pipeline-sh-functions - - -[ "${RDLOG-}" != 'console' ] || - logfile=/dev/console +if [ "${RDLOG-}" = console ]; then + BC_LOGFILE=/dev/console +elif [ -z "${NOTTYS-}" ] && + [ -n "$BC_LOG_VT" ] && + [ ! -c "$BC_LOGFILE" ] && + command -v openvt >/dev/null +then + touch -- "$BC_LOGFILE" + [ -e "/dev/tty$BC_LOG_VT" ] || + mknod "/dev/tty$BC_LOG_VT" c 4 "$BC_LOG_VT" + openvt -f -w -c$BC_LOG_VT -- /sbin/bootchain-logvt & +fi exec >"$BC_LOGFILE" 2>&1 message "Starting server [$(initrd_version)]..." +debug "Booting with /proc/cmdline:" +fdump /proc/cmdline run mkdir -p -- "$mntdir" "$BC_PASSED" -mountpoint -q "$mntdir" || - mount -t tmpfs tmpfs "$mntdir" ||: +mountpoint -q -- "$mntdir" || + run mount -t tmpfs tmpfs "$mntdir" ||: + +export chainsteps="${BOOTCHAIN-}" bootchain-loop -- 2.21.0