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=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding:content-language; bh=Ayqcmx89TD+Kck8oAwYfIoyTXU/SKc2yW8ZBlZDR9OU=; b=dXSw15y2Wn94WI6ZkumrgTRRWVWSccSe8OnRwzL+Y27V4OiA9wsjURvRKSLwoS5rnm P3jYXsZpOsDEjw/fHQZM/qqzOSexYr7p6g7RzgIR7xpqSPF+p6fqgUqBl/Y2Qb7WoCjN 8/U2HOi5XK8gUxUSUda4m/eEOCY/0gJnBDTfUJ2sh0CvEvuApnBtKyG51Eqk6Vo/atIj s5ttbWXSPyaHKRIvoGrxCt+TPQoV/4YxvNyfA8EQMT1qkHcQDpR6bCPThMIAVjMBcOhf CfZP9OPj3DeYIfajakvCQhM8mrAO2Gd9+m+eDlUhNI4pbpSv2n6ljD+m4JjC9ycF0TDr ApRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; 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=Ayqcmx89TD+Kck8oAwYfIoyTXU/SKc2yW8ZBlZDR9OU=; b=CDB5ACQWuTAnpQBxmlEACUqyhGZYkPTmXgiDR5BrMR44BGc1ew1o2y4johipNcgOLv bC9uM396Dt5jcpfHKEj5MX8R3TZtjwUskKv62/bCB2dVgCQzsqlhWuCf9sYM+Wo0MQcv Uuui1WXvIafFKjEBwjgCt6zAjhU5TIkzoWCQyWSUs7gsokXLjOVHyJRfpegZ7GbOA/QH dOjFE7M1tzwKtpgUIJgTUSOaupFBqexYP7Cug9dX8vGoH3VvFYzpPCUTd91fY0LRsZ5L zEDfTmkTPcMW5RvAXgnsOVppLD6DUL6e4aZvD3llNmBsSGsLzS4IE7F1WDZYrMpzevK8 c57A== X-Gm-Message-State: AOAM533/949IcVfig0nbfkSHcB+gAeV4M20qvzKfPAdN3+Jzl0E/gax3 Z1f+Ww0en2bOh0MdR/mn2hOvsf/W0lY= X-Google-Smtp-Source: ABdhPJwBQHzRuTKvOP7lYll1cGC980LOM9NdD4S2atoUp4lJbGAezPz/v0qCj6r++ffWEKuoRlMs9A== X-Received: by 2002:a05:6512:11c2:: with SMTP id h2mr9697098lfr.94.1617388662291; Fri, 02 Apr 2021 11:37:42 -0700 (PDT) To: make-initrd@lists.altlinux.org References: <20210331133927.j3gupd4yfflszaum@example.org> <83d214e6-2616-03ba-901b-4a92c69c22ff@gmail.com> <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> From: Leonid Krivoshein Message-ID: <7f508fac-8c89-7d23-5a56-9914ba0aaa9e@gmail.com> Date: Fri, 2 Apr 2021 21:37:41 +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: <20210401090223.nvnaf6nahsm2waij@example.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: ru 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: Fri, 02 Apr 2021 18:37:44 -0000 Archived-At: List-Archive: 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=*) Пока просто посоветоваться... А ещё хотел спросить: в этой же get_dev() есть такая строка: [ "${MAJOR-}" = "$(( $value / 256 ))" ] && [ "${MINOR-}" = "$(( $value % 256 ))" ] || Но я не нашёл выше кода, который присваивал бы значение переменной $value. Тут точно нет ошибки? -- Best regards, Leonid Krivoshein.