From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Sun, 26 Sep 2021 16:06:12 +0200 From: Alexey Gladkov To: make-initrd@lists.altlinux.org Message-ID: <20210926140612.q57yozckg6pduvzn@example.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Subject: Re: [make-initrd] [PATCH v1 16/41] fork pipeline: waitdev: get_dev_wpfx() function 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: Sun, 26 Sep 2021 14:06:13 -0000 Archived-At: List-Archive: On Fri, Sep 24, 2021 at 06:57:08PM +0300, Leonid Krivoshein wrote: > --- > .../data/lib/uevent/filters/bootchain-waitdev | 19 ++++++++++++++++++- > 1 file changed, 18 insertions(+), 1 deletion(-) > > diff --git a/make-initrd/features/bootchain-waitdev/data/lib/uevent/filters/bootchain-waitdev b/make-initrd/features/bootchain-waitdev/data/lib/uevent/filters/bootchain-waitdev > index 272aee7..13d90fa 100755 > --- a/make-initrd/features/bootchain-waitdev/data/lib/uevent/filters/bootchain-waitdev > +++ b/make-initrd/features/bootchain-waitdev/data/lib/uevent/filters/bootchain-waitdev > @@ -3,6 +3,23 @@ > . /.initrd/initenv > . initrd-sh-functions > +get_dev_wpfx() Я-то думал, что только чехи на гласных экономят! Что такое wpfx ? Добавь описание коммиту. > +{ > + local retval="$1" name="$2" > + > + case "$name" in > + CDROM:*) > + [ "${ID_CDROM-}" = 1 ] || > + [ "${ID_FS_TYPE-}" = iso9660 ] || > + return 1 > + name="${name#CDROM:}" > + name="${name:-/dev/sr0}" > + ;; > + esac > + > + get_dev "$retval" "$name" > +} > + > mkdir -p -- /.initrd/bootchain/waitdev > cd /.initrd/bootchain/waitdev/ > @@ -10,7 +27,7 @@ i=0 > while [ "$i" -lt "${WAITDEV:-0}" ]; do > eval "spec=\"\${WAITDEV$i-}\"" > - if [ -n "$spec" ] && get_dev dev "$spec"; then > + if [ -n "$spec" ] && get_dev_wpfx dev "$spec"; then > printf '%s\n' "$dev" > "$i" > fi > -- 2.21.0 > > > _______________________________________________ > Make-initrd mailing list > Make-initrd@lists.altlinux.org > https://lists.altlinux.org/mailman/listinfo/make-initrd > -- Rgrds, legion