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=M4u/hhpm7fVSh0oqNplZ1d6TEZiH7cdGBPzKzpylo4s=; b=pSK+DSxUxKxZ62xUXzaqBBce4+OaIZSBi7DKVNW337ENy3ajfWW7D2noQq/+D//757 CT2AaZkIVX2jJ6rnNjPfI3OICDRP3i77g37ULTpx9L2ZsgQDTgcPGX1FvKBZf/c7RV21 BepMyztfLZJ/2tEEZHVOT6ReQICZMCzykyeLaYzu45mzD4j5z3+IDXBzZTrtDO1/ls+8 +g4l9bjZLTa8b72g56j15ukMUaL8YnA6+A/qcScq+yAc2lfg2B9ED516gJ8AQonFLO/a fbRk0+iFJErNRXXfxjZgeseNcrpYFmMc66UHWFqKXAodk1y/fiUq8aPHUs/MMSmv9kBU 8bIQ== 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=M4u/hhpm7fVSh0oqNplZ1d6TEZiH7cdGBPzKzpylo4s=; b=bgUx8T39yHiplv9EtYqU4Ye57ycsb6vIUcluL87ZDfGYKUoMBxl1qa+t1J+SeRetwX OekTIpAXO3i15emH829XeHIxccAsemFnDr+3OvkuA3nnwIpa81pnHmy/HOSzitZE1A4Y il6c6w917TLqYgcmvPkCOpMdh+9iODDgAnNlz5wNWX42bqD0P6PdlOeQcnNn4y/EyjEO Sl+Qn5M+oojNjZhhbgCL6Yk87UFLHOdL37sKCyuh7LgIeNG/hX6RLiUsniKYkZ6MWpv/ Vj8IDG1AQbaU1ARlNXkOcL2qUAbekZWcGNeFDDUZsJA0CP6jlvZXv01rCNYFqTpV7W8E rRiQ== X-Gm-Message-State: AOAM531XlFWok1XHeivthxnipKiTcfSn9V4/clMrwFHddGezID1qZ2bH XIKopZKJl4R3m3cHVLa+v4ab5gwKzeo= X-Google-Smtp-Source: ABdhPJyRqCnAoDRWJ6CQvxNTkPpUXY6B6CXbkGV/uS6iL0cWCaY//y39YN+yyTqcCxO61H07/xPxlA== X-Received: by 2002:a05:651c:1204:: with SMTP id i4mr7590151lja.445.1632499045725; Fri, 24 Sep 2021 08:57:25 -0700 (PDT) From: Leonid Krivoshein To: make-initrd@lists.altlinux.org Message-ID: <0ee78ddc-c4d2-9b7a-9568-a9a98e3eb627@gmail.com> Date: Fri, 24 Sep 2021 18:57:24 +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 18/41] fork pipeline: waitdev: infinite loop fixed, DEVNAME added 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:29 -0000 Archived-At: List-Archive: --- .../bootchain-waitdev/data/lib/bootchain/waitdev | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/make-initrd/features/bootchain-waitdev/data/lib/bootchain/waitdev b/make-initrd/features/bootchain-waitdev/data/lib/bootchain/waitdev index 74af6ea..60464d9 100755 --- a/make-initrd/features/bootchain-waitdev/data/lib/bootchain/waitdev +++ b/make-initrd/features/bootchain-waitdev/data/lib/bootchain/waitdev @@ -13,12 +13,16 @@ while [ -n "$devspec" ]; do read -r devfile < "$envfile" ||: if [ -n "$devfile" ]; then - if [ ! -e "$destdir/dev" ]; then - target="$(readlink-e "$devfile")" + target="$(readlink-e "$devfile" 2>/dev/null ||:)" + + if [ -b "$target" ] || [ -c "$target" ]; then + message "target device found: $target" + printf '%s\n' "$target" > "$destdir/DEVNAME" run cp -a -- "$target" "$destdir/dev" + break fi - break fi fi + sleep 1 done -- 2.21.0