From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gladkov.alexey@gmail.com>
Date: Sat, 3 Apr 2021 13:09:23 +0200
From: Alexey Gladkov <gladkov.alexey@gmail.com>
To: make-initrd@lists.altlinux.org
Message-ID: <20210403110923.djpovbnytsfafkjm@example.org>
References: <20210331144057.m3eyfwnns2x3s6do@example.org>
 <d01d6e1c-ba6a-b900-a49c-ef449e2c45e4@basealt.ru>
 <20210331152230.dshas3odtszxafyv@example.org>
 <27101e86-3f0a-4612-9ecf-eb46e84ec71a@basealt.ru>
 <20210331155728.w4x2y6sqnnuykdzf@example.org>
 <0d538efa-d51b-f3f7-3034-97f2aa56ce2e@gmail.com>
 <20210331165523.lm27dw6bxnsaux3d@example.org>
 <e4c03eb1-6b9b-889b-e8b7-cdea8c7490ca@gmail.com>
 <20210401090223.nvnaf6nahsm2waij@example.org>
 <7f508fac-8c89-7d23-5a56-9914ba0aaa9e@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <7f508fac-8c89-7d23-5a56-9914ba0aaa9e@gmail.com>
Subject: Re: [make-initrd] Release make-initrd 2.14.0
X-BeenThere: make-initrd@lists.altlinux.org
X-Mailman-Version: 2.1.12
Precedence: list
Reply-To: make-initrd@lists.altlinux.org
List-Id: <make-initrd.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/make-initrd>,
 <mailto:make-initrd-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/make-initrd>
List-Post: <mailto:make-initrd@lists.altlinux.org>
List-Help: <mailto:make-initrd-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/make-initrd>,
 <mailto:make-initrd-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Apr 2021 11:09:24 -0000
Archived-At: <http://lore.altlinux.org/make-initrd/20210403110923.djpovbnytsfafkjm@example.org/>
List-Archive: <http://lore.altlinux.org/make-initrd/>

On Fri, Apr 02, 2021 at 09:37:41PM +0300, Leonid Krivoshein wrote:
> 
> 01.04.2021 12:02, Alexey Gladkov пишет:
> > Я бы предложил синтаксис аналогичный ip=, где разные поля разделены
> > двоеточиями т.е. mountfs=<device>[:<fstype>[:<mountopts>]]
> 
> И ещё FSTYPE=... по аналогии можно сделать:
> 
> 
> diff --git a/data/bin/initrd-sh-functions b/data/bin/initrd-sh-functions
> index a56e872..0e433c6 100644
> --- a/data/bin/initrd-sh-functions
> +++ b/data/bin/initrd-sh-functions
> @@ -33,10 +33,26 @@ get_dev() {
> 
>         case "$name" in
>                 '')
>                         return 1
>                         ;;
> +               CDROM:*)
> +                       [ "${ID_CDROM-}" = "1" ] || [ "${ID_FS_TYPE-}" =
> "iso9660" ] ||
> +                               return 1
> +                       name="${name#CDROM:}"
> +                       name="${name:-/dev/sr0}"
> +                       ;;
> +               FSTYPE=*:?*)
> +                       name="${name#FSTYPE=}"
> +                       value="${name%%:*}"
> +                       [ "${ID_FS_TYPE-}" = "$value" ] ||
> +                               return 1
> +                       name="${name#*:}"
> +                       ;;
> +       esac
> +
> +       case "$name" in
>                 UUID=*)
>                         [ "${ID_FS_UUID-}" = "${name#UUID=}" ] ||
>                                 return 1
>                         ;;
>                 LABEL=*)
> 

$ git grep '\<get_dev '
data/lib/uevent/filters/mountdev:21:            get_dev dev "$fsdev" ||
data/lib/uevent/filters/resume:8:get_dev devresume "${RESUME-}" ||
features/luks/data/lib/uevent/filters/luks:31:                  get_dev devluks "$dev" &&
features/luks/data/lib/uevent/filters/luks:35:  get_dev devluks "$DEVNAME" ||
features/luks/data/lib/uevent/filters/lukskeys:26:      get_dev realdev "$keydev" ||
features/luks/data/lib/uevent/handlers/085-luks:32:             get_dev realdev "$luksdev"
features/luks/data/lib/uevent/handlers/085-luks:70:                     get_dev "$luksdev" ||
features/pipeline/data/lib/uevent/filters/pipeline-waitdev:13:  if [ -n "$spec" ] && get_dev dev "$spec"; then

Ты правда хочешь, чтобы во всех этих фичах появилась поддержка cdrom:* ?

> Пока просто посоветоваться...
> А ещё хотел спросить: в этой же get_dev() есть такая строка:
> 
> [ "${MAJOR-}" = "$(( $value / 256 ))" ] && [ "${MINOR-}" = "$(( $value % 256
> ))" ] ||
> 
> Но я не нашёл выше кода, который присваивал бы значение переменной $value.
> Тут точно нет ошибки?

Ты прав. Это регрессия после коммита:

799fd42580f4a7321050bad98d35e97f33275e7f

-- 
Rgrds, legion