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=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding:content-language; bh=oVLeaoJ1YA8S5O871mMFu8WnfB1v31Q36IRtDkhmZKI=; b=pWkb8QDIbs0lQCUlLyHN2bI4Ngbo2SpAd5wLN7ownY9N7mLQaU41yjQx+YaT+M2ko5 PxkkRQxNG9jz6yguhBso8puP1SqEb6VfcJ4YCxXLK7eewaQVGKo5qHkAMhzjUsQacW1i rmLCQzkaglNRJ0sOgSszVnmpdaJtLkEvTTerW+gdD9H5+w/bg8E+hQc3VN/ay0GKaimH CDqDXwbfsFlq2BQj4eh4CekF2uiO48Rd6W42qQUo39ePQCvkNrRlwueyDIeLdaSptrNX Hx8eFo3ej0jbZAWmB4ulT71wQ0YgXfpk/+pTzXeJklKW9H5SVUY1WDInarvA2DoTkdq1 um2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=oVLeaoJ1YA8S5O871mMFu8WnfB1v31Q36IRtDkhmZKI=; b=GRGD4bA89PN4u/qsfVIm8MNnAz6AQA2EKr4cWwspclA38ok3gKr7NS6SGMQY6iaWGn jodEvCAG5ZicoNAvFbAS6ZlnbSTsa5qhs/1ajghgNbN179bIrsh+bw2AQLX08XwjSMOx +B0EsR10QuYu2cYz4a+NKCuaHJTG1eqlly0ZNDNLNw+16PFFGcWSgmF39AvuEZNWTqyS K/ngC8qbuj8c4/53yF8eGoXQcZ+VHKITwH1sZaiRcbGEihaQ2/vwl/YHoiH9Q0ZDm8wz 8y12SBPONSjEnXS1QgE4Gka4AosIBJKYDULIk9a0/m1UVgYadGcC7RgBMU37f38D8O6/ gNZg== X-Gm-Message-State: AOAM531tKKBzzRhA17UEDGElZNUq9CCg9yBLSE98j/KVBbOoDNO9DTK5 KUk1bzbfyexWoHOxJV1aeFWdY6ortkE= X-Google-Smtp-Source: ABdhPJyslJBdIv8Rgown4INjRuKirJKqxBehCeyzLE+SsC2AKWWQsTA5sheV36wlnKaTFFHLdP2JDA== X-Received: by 2002:a05:651c:1596:: with SMTP id h22mr5373262ljq.146.1632685332291; Sun, 26 Sep 2021 12:42:12 -0700 (PDT) To: make-initrd@lists.altlinux.org References: <20210926140612.q57yozckg6pduvzn@example.org> From: Leonid Krivoshein Message-ID: Date: Sun, 26 Sep 2021 22:42:11 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20210926140612.q57yozckg6pduvzn@example.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: ru 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 19:42:15 -0000 Archived-At: List-Archive: 26.09.2021 17:06, Alexey Gladkov пишет: > 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 ? with prefix Извини, я думал это распространённое сокращение. Можно обозвать get_dev_prefixed, так нормально? > Добавь описание коммиту. OK >> +{ >> + 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 >> -- Best regards, Leonid Krivoshein.