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=YSG+UBX4n/fVRSaIIG1xcMBIxjS5Yj9/zc5BdzskYzQ=; b=DUFvR+wf5DuB/1AYrEf5CX3hCfS7N24mQW+d5jrBhvcoQ/uJyX3G3pnrjWPUpqEPpi Fum5l9xWhdlvi5Q4QAE0Z3CjUYn8J968YiA0mVb70+/5yvcYlD0FFnPCJL4+5p7vQh1O 0v1U04NWURtSt6+IfRsHZtd5oqrE6NUB9BSoFiPYb2T5W8KyGpXsqM3FBkPvXa8Sv41F daP2YNIGkL1HNHwcNSoBHTgfzwgkdpE2jLqNEiylKZe+TDAUScWrdd8bqMGpURRmCyiX i5tUSZcRTzE1l5Av/IisoSIHZzOjSEdgi74n0GGclLauJN4u8FDgKc7gNDMOhcrC9zzM EK1w== 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=YSG+UBX4n/fVRSaIIG1xcMBIxjS5Yj9/zc5BdzskYzQ=; b=4BEYgYKVCrnsyReO8fErI1xNiTZPIXJJYWM5whw6G8J+1HPrSnJEKeeFg18OqjzWUz QzTldak4/T+8JQLkkWjJL9m6CNbK/w11TdAcSS/qcXOnwN3xKYpYwWV9qAvGbjb6ew/Z n7fx6bm8Yjy67Qqf2seqQ51o1eGDdSg1dgdk7Y46l7jILim1BNcxHOIfKR7KUr8TD9K7 lPX/7oEhOPQSi1SzmA/uwZXPSfKeMUp3uphpQWKqGT8yD9BCpKNb57sXeFXhfzNY4m2H LCtn/ynnT6VaG7w+fY0ycwygcoWF2LrbjkZUuUNzfl8QdnsYeAPxfb33f7DWz9dhMYMx m7QA== X-Gm-Message-State: AOAM530id5e8tR+YUmgq58wMfJTL8tGwiRlzpPWyiFn6JPa4rjbZ8VEL jH48CjZ/ur9C5Pw7hXVKy28BM9z9hXY= X-Google-Smtp-Source: ABdhPJxStNzH+xlebI3QYRFawiDygsk0nI1kK8cMt4/8O3Ep/FrnUl8LHMUfvzP0npF2uoPR33fCPQ== X-Received: by 2002:a2e:140f:: with SMTP id u15mr247883ljd.361.1632499051295; Fri, 24 Sep 2021 08:57:31 -0700 (PDT) From: Leonid Krivoshein To: make-initrd@lists.altlinux.org Message-ID: Date: Fri, 24 Sep 2021 18:57:30 +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 19/41] fork pipeline: waitdev: use optional waitdev_timeout 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:57:33 -0000 Archived-At: List-Archive: --- .../data/lib/bootchain/waitdev | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/make-initrd/features/bootchain-waitdev/data/lib/bootchain/waitdev b/make-initrd/features/bootchain-waitdev/data/lib/bootchain/waitdev index 60464d9..fa99c45 100755 --- a/make-initrd/features/bootchain-waitdev/data/lib/bootchain/waitdev +++ b/make-initrd/features/bootchain-waitdev/data/lib/bootchain/waitdev @@ -3,6 +3,14 @@ . bootchain-sh-functions check_parameter WAITDEV + +timeout= +timecnt=/.initrd/bootchain/waitdev/TIMECNT + +[ ! -s "$timecnt" ] || + read -r timeout < "$timecnt" ||: +[ "$timeout" != 0 ] || + exit 0 devspec="$(get_parameter WAITDEV)" while [ -n "$devspec" ]; do @@ -25,4 +33,14 @@ while [ -n "$devspec" ]; do fi sleep 1 + [ -n "$timeout" ] || + continue + timeout=$(($timeout - 1)) + + if [ "$timeout" = 0 ]; then + message "device waiting timeout exceedded" + break + fi done + +[ -z "$timeout" ] || printf '%s\n' "$timeout" > "$timecnt" -- 2.21.0