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=-4.3 required=5.0 tests=ALL_TRUSTED,BAYES_00, RP_MATCHES_RCVD autolearn=unavailable autolearn_force=no version=3.4.1 To: make-initrd@lists.altlinux.org References: <20210331144057.m3eyfwnns2x3s6do@example.org> <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> <20210401090223.nvnaf6nahsm2waij@example.org> <7f508fac-8c89-7d23-5a56-9914ba0aaa9e@gmail.com> <20210403110923.djpovbnytsfafkjm@example.org> <7335da84-8213-c77b-7062-8af41ea46d46@gmail.com> From: =?UTF-8?B?0JDQvdGC0L7QvSDQnNC40LTRjtC60L7Qsg==?= Message-ID: <24e78a6c-7a5b-da37-183f-05db4e6f6140@basealt.ru> Date: Sat, 3 Apr 2021 18:37:07 +0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <7335da84-8213-c77b-7062-8af41ea46d46@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: ru Content-Transfer-Encoding: 8bit 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Apr 2021 11:37:12 -0000 Archived-At: List-Archive: 03.04.2021 18:31, Leonid Krivoshein пишет: > > 03.04.2021 14:09, Alexey Gladkov пишет: >> On Fri, Apr 02, 2021 at 09:37:41PM +0300, Leonid Krivoshein wrote: >>> 01.04.2021 12:02, Alexey Gladkov пишет: >>>> Я бы предложил синтаксис аналогичный ip=, где разные поля разделены >>>> двоеточиями т.е. mountfs=[:[:]] >>> И ещё 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 '\> 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:* ? > > Пока CDROM нужен лишь одной фиче (последняя строка), но, вдруг ещё где потребуется? Соответственно, варианта только два: Да не нужен cdrom нам вообще. -- С уважением, Антон Мидюков