From: Benjamin Marzinski <bmarzins@redhat.com>
To: mwilck@suse.com
Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>,
dm-devel@lists.linux.dev,
Xose Vazquez Perez <xose.vazquez@gmail.com>
Subject: Re: [PATCH v2 11/14] Makefile.inc, README.md: fix docs for prefix in split-usr case
Date: Fri, 27 Oct 2023 15:27:19 -0400 [thread overview]
Message-ID: <ZTwPF2zsBVeUT6wV@bmarzins-01.fast.rdu2.eng.redhat.com> (raw)
In-Reply-To: <20231026174153.1133-12-mwilck@suse.com>
On Thu, Oct 26, 2023 at 07:41:50PM +0200, mwilck@suse.com wrote:
> From: Martin Wilck <mwilck@suse.com>
>
> systemd with "split-usr=true" uses rootprefixdir as prefix for
> units and for udev libraries and rules ("udevlibexecdir" in
> systemd). Fix the documentation for this case. Also, slightly
> improve the paragraph about SCSI module loading.
>
> Signed-off-by: Martin Wilck <mwilck@suse.com>
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
> Cc: Xose Vazquez Perez <xose.vazquez@gmail.com>
> ---
> Makefile.inc | 6 ++++--
> README.md | 25 ++++++++++++++++++-------
> 2 files changed, 22 insertions(+), 9 deletions(-)
>
> diff --git a/Makefile.inc b/Makefile.inc
> index 8655cba..a20e2ce 100644
> --- a/Makefile.inc
> +++ b/Makefile.inc
> @@ -40,8 +40,10 @@ usr_prefix := $(prefix)
> # Prefix for configfuration files (multipath.conf)
> etc_prefix := $(prefix)
> # Where to install systemd-related files. systemd is usually installed under /usr
> -# Note: some systemd installations use separate "prefix" and "rootprefix".
> -# In this case, override only unitdir to use systemd's "rootprefix" instead of $(systemd_prefix)
> +# Note: systemd installations with "split-usr=true" use separate "prefixdir" and
> +# "rootprefixdir". Our systemd_prefix corresponds to "prefixdir".
> +# In this case, override only unitdir and libudevdir below to use
> +# systemd's "rootprefixdir" instead of $(systemd_prefix)
> systemd_prefix := /usr
>
> # Make sure all prefix variables end in "/"
> diff --git a/README.md b/README.md
> index 524c9fb..25ce963 100644
> --- a/README.md
> +++ b/README.md
> @@ -111,6 +111,13 @@ The following variables can be passed to the `make` command line:
> polling API. For use with pre-5.0 kernels that don't support dmevent polling
> (but even if you don't use this option, multipath-tools will work with
> these kernels).
> + * `SYSTEMD`: The version number of systemd (e.g. "244") to compile the code for.
> + The default is autodetected, assuming that the systemd version in the build
> + environment is the same as on the target system. Override the value to
> + build for a different systemd version, or set it to `""` to build for a
> + system without systemd.
> + **Caution:** multipathd without systemd has been largely untested by the
> + upstream maintainers since at least 2020.
> * `SCSI_DH_MODULES_PRELOAD="(list)"`: specify a space-separated list of SCSI
> device handler kernel modules to load early during boot. Some
> multipath-tools functionality depends on these modules being loaded
> @@ -122,7 +129,9 @@ The following variables can be passed to the `make` command line:
> It's especially useful if `scsi_mod` is builtin but `scsi_dh_alua` and
> other device handler modules are built as modules. If `scsi_mod` itself is compiled
> as a module, it might make more sense to use a module softdep for the same
> - purpose.
> + purpose by creating a `modprobe.d` file like this:
> +
> + softdep scsi_mod post: scsi_dh_alua scsi_dh_rdac
>
> ### Installation Paths
>
> @@ -133,9 +142,9 @@ The following variables can be passed to the `make` command line:
> for booting. Non-usr-merged distributions[^systemd] may want to set this to
> `/usr`. The default is `$(prefix)`.
> * `systemd_prefix`: Prefix for systemd-related files[^systemd]. The default is `/usr`.
> - * `etc_prefix`: The prefix for configuration files. "Usr-merged"
> + * `etc_prefix`: The prefix for configuration files. "usr-merged"
> distributions with immutable `/usr`[^systemd] may want to set this to
> - `/etc`. The default is `$(prefix)`.
> + `""`. The default is `$(prefix)`.
> * `LIB`: the subdirectory under `prefix` where shared libraries will be
> installed. By default, the makefile uses `/lib64` if this directory is
> found on the build system, and `/lib` otherwise.
> @@ -144,10 +153,12 @@ The options `configdir`, `plugindir`, `configfile`, and `statedir` above can
> be used for setting individual paths where the `prefix` variables don't provide
> sufficient control. See `Makefile.inc` for even more fine-grained control.
>
> -[^systemd]: Some systemd installations use separate `prefix` and `rootprefix`.
> - On such a distribution, set `prefix`, and override `unitdir` to use systemd's
> - `rootprefix`. Recent systemd releases generally require everything to be
> - installed under `/usr` (so-called "usr-merged" distribution). On "usr-
> +[^systemd]: systemd installations up to v254 which have been built with
> + `split-usr=true` may use separate `prefixdir` and `rootprefixdir`
> + directories, where `prefixdir` is a subdirectory of `rootprefixdir`.
> + multipath-tools' `systemd_prefix` corresponds to systemd's `prefixdir`.
> + On such distributions, override `unitdir` and `libudevdir` to use systemd's
> + `rootprefix`: `make libudevdir=/lib/udev unitdir=/lib/systemd/system`
>
> ### Compiler Options
>
> --
> 2.42.0
next prev parent reply other threads:[~2023-10-27 19:27 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-26 17:41 [PATCH v2 00/14] multipath: aio, systemd, and documentation improvements mwilck
2023-10-26 17:41 ` [PATCH v2 01/14] libmultipath: reduce log level of directio messages mwilck
2023-10-26 17:41 ` [PATCH v2 02/14] libmultipath: directio: don't reset ct->running after io_cancel() mwilck
2023-10-27 18:54 ` Benjamin Marzinski
2023-10-26 17:41 ` [PATCH v2 03/14] libmultipath: directio: fix error handling mwilck
2023-10-27 18:54 ` Benjamin Marzinski
2023-10-26 17:41 ` [PATCH v2 04/14] libmultipath: io_err_stat: don't free aio memory before completion mwilck
2023-10-27 18:55 ` Benjamin Marzinski
2023-10-26 17:41 ` [PATCH v2 05/14] libmultipath: io_err_stat: call io_destroy() inside free_io_err_pathvec() mwilck
2023-10-27 18:55 ` Benjamin Marzinski
2023-10-26 17:41 ` [PATCH v2 06/14] libmultipath: io_err_stat: use higher number of aio slots mwilck
2023-10-27 18:56 ` Benjamin Marzinski
2023-10-26 17:41 ` [PATCH v2 07/14] libmultipath: io_err_stat: fix error handling mwilck
2023-10-27 19:09 ` Benjamin Marzinski
2023-10-26 17:41 ` [PATCH v2 08/14] multipathd.service: require modprobe@dm_multipath.service if available mwilck
2023-10-27 19:09 ` Benjamin Marzinski
2023-10-27 20:05 ` Benjamin Marzinski
2023-10-30 11:45 ` Martin Wilck
2023-10-26 17:41 ` [PATCH v2 09/14] libmpathutil: remove systemd_service_enabled() mwilck
2023-10-26 17:41 ` [PATCH v2 10/14] multipath.conf.5: fix typo mwilck
2023-10-27 19:10 ` Benjamin Marzinski
2023-10-26 17:41 ` [PATCH v2 11/14] Makefile.inc, README.md: fix docs for prefix in split-usr case mwilck
2023-10-27 19:27 ` Benjamin Marzinski [this message]
2023-10-26 17:41 ` [PATCH v2 12/14] README.md: update mailing list and contributing information mwilck
2023-10-27 19:29 ` Benjamin Marzinski
2023-10-30 11:41 ` Martin Wilck
2023-10-26 17:41 ` [PATCH v2 13/14] README.md: Extend the section about NVMe mwilck
2023-10-27 19:34 ` Benjamin Marzinski
2023-10-26 17:41 ` [PATCH v2 14/14] README.md: fix formatting of Changelog section mwilck
2023-10-27 19:35 ` Benjamin Marzinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZTwPF2zsBVeUT6wV@bmarzins-01.fast.rdu2.eng.redhat.com \
--to=bmarzins@redhat.com \
--cc=christophe.varoqui@opensvc.com \
--cc=dm-devel@lists.linux.dev \
--cc=mwilck@suse.com \
--cc=xose.vazquez@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.