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=dAG7lcz5+sHU+Wd7EtOLiSxkF7hxwEZ6n3C4HIaeEXs=; b=SvbUU4yiBP18enQHLAr5q6X2p8kDBhL1wzlQ0EJGYZr+QZ5q/0SSWmZxrY5otPRCAy koq6YMpsblUPa9+VeqC5k/gAZ9LWg1SokApt5PXFhJ3eRJEp5Uyr9iVNtU1u2Nzq+x7r pFarJtF/PrxRGdHKaq5yw9jpuzYz9O/O4HCLGs1n2/bOpVZadhbgtxO6IF7aUv98gUml hMbTGgdHIlqpIVsPmGwKVCLf2A3yhCIWFq1AIU+6JUwsFX3eAvwxlxBKogm+oj4v2rzY YlOqjO6U9fke829qhzFlGNW4RRMsab+LOfns7eksYs2JKnvws2fuxTMinYQqHGORpErS MQkw== 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=dAG7lcz5+sHU+Wd7EtOLiSxkF7hxwEZ6n3C4HIaeEXs=; b=bYK+xkywjRQjbdHC2n7XqB2CiIHjUJQrOS36iW2lcZ2tgWpcwZQZG1BwIJy++76Vjj Gpd2zcNB4G1GAbBGH8ecNwZVNSfRdLSrKYKAZUx2r+FCH9A+NyBER/giYekcT6+OoBa5 BJ6pItCMltGO2dBJGXQ3WIa+SIvRzT98tXx5ioVU60m5Sx4dBbfALkjxTKTqjyANWv1r zzMZ31uOAxkjURCjVzT3qh/G/34STZmqezvyT+4miEurJMu4DUYcCrOvUL4hnx5CYIOw 709rZeUcgvbE6V4BGDaQO/NRUbsbIoM4T4XyJzroLsVc7WHD9bsmjk6NGdVyKxzCBtv6 qjaw== X-Gm-Message-State: AOAM53253CYXYJKJze5ciIIEjszlVJauS+1K8axhf9XojnY1Vvc9Ocb0 KOkOiGrOKn/hCWARHH9GhC5f5mYy0HU= X-Google-Smtp-Source: ABdhPJzgQMyBpj5z5+7yHA36F4+GpybhZIG9swtWglBzykgE6+4v7gqkARzWrA5yjkmklYSq5dWloA== X-Received: by 2002:a2e:99d3:: with SMTP id l19mr11649811ljj.184.1632499029035; Fri, 24 Sep 2021 08:57:09 -0700 (PDT) From: Leonid Krivoshein To: make-initrd@lists.altlinux.org Message-ID: Date: Fri, 24 Sep 2021 18:57:08 +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 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: Fri, 24 Sep 2021 15:57:11 -0000 Archived-At: List-Archive: --- .../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() +{ + 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