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-language; bh=C9C2jzYuniVDtHPyb2bzI4DmtMZp8CEh7NrdOtdObI0=; b=haVgPWOjaOcC8hgFd5A6V53dHkLOFC6L19MmbRnQejvGiCyPd8ofs9lS9QkRqHzt5K 5V2XD0MOoXh4SWIobxBWzekVrO04E8Y0EA17LQLgKsrgVr65K0YSRiPlKzxOYRnOR5M6 w2ukot+vRKAUpGuHCFkfB4pqda83swl2fx0I+uhRmQQ+zRk8pC+BlFYWiy4VX6pqoAII SZfyKfhY5E6IaEzL9PrphA+QKdhl3LewddGLGG2U4BFNkbSkmBiFQ7bvfeV93QrpRqbJ nD/62FfFWJ8iWkFmKf1mq1x58L/78LizpcrBNnSe/IttQd+lhgzeuCTbu1y6DIGD1ig7 kkKg== 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-language; bh=C9C2jzYuniVDtHPyb2bzI4DmtMZp8CEh7NrdOtdObI0=; b=NALJXDg8SSOsswyAlhE+WwM0UTJbfPEGcsjAqwDH/sPdFMsZKJMM6VnpbZlOZxz4t1 YC4aMfBjlwgyOilU+mvvFE+zn1o7UMK1bCKuU/ykGyn4c11MNTyp0Lx9+Az4LJFKwfLK x7OG8tffx+m8koPeBNEeU/D4pElujefyXzJl/HDdlG4uV2t1L6Ia3cUu6ZAU/K0aDUTO YnlfqOqv6/3QfxNbEgoxov86oCYUrnsl/ZgYdZaHNtFz62XR15xA02CZIkrAmQqGUWtY 1ViWk+PafjXAJqZ8tTdknr0TqARlSoigZUpKnlqc8vyBSg4rVi/8ifu2AjFZrqvFU7Es EMTw== X-Gm-Message-State: AOAM533xlhvYvrVad/MQbGZbXbJa4MNtk7yuKH2cN1nNCKibTzX+LXgV CVsddjdMn/ek9lLDxWYRV6KtWYtkAe4= X-Google-Smtp-Source: ABdhPJzlAiqNjai8xdvCLsgq/fecNZqWPf3E+0QFFl1dlS791mccYPnZ7bmaUe9hZD/U5aW/pTM1gQ== X-Received: by 2002:a2e:8053:: with SMTP id p19mr3652814ljg.89.1617234546361; Wed, 31 Mar 2021 16:49:06 -0700 (PDT) To: make-initrd@lists.altlinux.org References: <20210331074456.xtkckveii34cxh64@example.org> <574c8249-330c-1888-07ad-c49cce5f02f4@gmail.com> <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> From: Leonid Krivoshein Message-ID: Date: Thu, 1 Apr 2021 02:49:05 +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: <20210331165523.lm27dw6bxnsaux3d@example.org> Content-Type: multipart/mixed; boundary="------------7B2E9F46454D7C3618A962C5" 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: Wed, 31 Mar 2021 23:49:09 -0000 Archived-At: List-Archive: This is a multi-part message in MIME format. --------------7B2E9F46454D7C3618A962C5 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit 31.03.2021 19:55, Alexey Gladkov пишет: > On Wed, Mar 31, 2021 at 07:20:58PM +0300, Leonid Krivoshein wrote: > [...] >> А что вообще думаешь об аналогии всяких rootonly=, roottype=, rootro=, итп >> для waitdev? > А какой у этого юскейс ? > > waitdev только ожидает появления устройства. Оно не монтируется. Для > mountfs наверно в этом есть смысл. > >> Ведь сейчас waitdev позволяет указать только само устройство, >> подобно root=, но указать дополнительные параметры не получится. В качестве "пробы пера" и консультации (пока не проверял) прикладываю первый патч. Собственно, вопрос в том, можно ли так делать и будет ли это работать? -- Best regards, Leonid Krivoshein. --------------7B2E9F46454D7C3618A962C5 Content-Type: text/x-patch; name="mountfs.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="mountfs.patch" commit 2c91f793bde657bb0bbd57b14a49cc5e1728dd19 Author: Leonid Krivoshein Date: Thu Apr 1 02:45:23 2021 +0300 pipeline/mountfs: add MOUNTFSOPTS= and MOUNTFSTYPE= parameters diff --git a/features/pipeline/README.md b/features/pipeline/README.md index c573163..fa3f9e3 100644 --- a/features/pipeline/README.md +++ b/features/pipeline/README.md @@ -16,11 +16,16 @@ the previous elements. - `pipeline=name[,name1][,name2]` - the main parameter that determines the order in which pipe elements are called. - `getimage` specifies an URL to fetch and mount. -- `mountfs` specifies a file to mount. -- `overlayfs` defines a list of elements to be combined. - `waitdev` describes the local device to wait. The format of this parameter is the same as `root=`. +## Optional additional parameters + +- `mountfs` specifies a file to mount. +- `mountfstype` specifies a filesystem type. +- `mountfsopts` specifies a mount options. +- `overlayfs` defines a list of elements to be combined. + The separator between the elements is a comma (`,`). The parameters can be specified more than once depending on how many times diff --git a/features/pipeline/data/etc/initrd/cmdline.d/pipeline b/features/pipeline/data/etc/initrd/cmdline.d/pipeline index 4200d57..eb4854e 100644 --- a/features/pipeline/data/etc/initrd/cmdline.d/pipeline +++ b/features/pipeline/data/etc/initrd/cmdline.d/pipeline @@ -3,3 +3,5 @@ register_array string GETIMAGE register_array string MOUNTFS register_array string OVERLAYFS register_array string WAITDEV +register_array string MOUNTFSOPTS +register_array string MOUNTFSTYPE diff --git a/features/pipeline/data/lib/pipeline/mountfs b/features/pipeline/data/lib/pipeline/mountfs index 138afa5..6833455 100755 --- a/features/pipeline/data/lib/pipeline/mountfs +++ b/features/pipeline/data/lib/pipeline/mountfs @@ -9,8 +9,10 @@ target="$(resolve_target "$param")" [ -n "$target" ] || fatal "unable to resolve: $param" -opts= -[ ! -c "$target" ] && [ ! -b "$target" ] || +fstype="$(get_parameter MOUNTFSTYPE)" + +opts="$(get_parameter MOUNTFSOPTS)" +[ ! -c "$target" ] && [ ! -b "$target" ] || [ -n "$opts" ] || opts='ro,loop' -run mount ${opts:+-o $opts} "$target" "$destdir" +run mount ${fstype:+-t $fstype} ${opts:+-o $opts} -- "$target" "$destdir" --------------7B2E9F46454D7C3618A962C5--