diff options
author | Lennart Poettering <lennart@poettering.net> | 2021-06-24 18:06:02 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-06-24 22:30:14 +0200 |
commit | de61a04b188f81a85cdb5c64ddb4987dcd9d30d3 (patch) | |
tree | b83ed81038b2f51d09f4d410a63fe2e259f83f11 /src/shared/specifier.h | |
parent | 0c651d32d49e66ea0152eea5e65dd19fe01e7a06 (diff) | |
download | systemd-de61a04b188f81a85cdb5c64ddb4987dcd9d30d3.tar.gz |
tree-wide: make specifier expansion --root= aware
This fixes repart's, systemctl's, sysusers' and tmpfiles' specifier
expansion to honour the root dir specified with --root=. This is
relevant for specifiers such as %m, %o, … which are directly sourced
from files on disk.
This doesn't try to be overly smart: specifiers referring to runtime
concepts (i.e. boot ID, architecture, hostname) rather than files on the
medium are left as is. There's certainly a point to be made that they
should fail in case --root= is specified, but I am not entirely convinced
about that, and it's certainly something we can look into later if
there's reason to.
I wondered for a while how to hook this up best, but given that quite a
large number of specifiers resolve to data from files on disks, and most
of our tools needs this, I ultimately decided to make the root dir a
first class parameter to specifier_printf().
Replaces: #16187
Fixes: #16183
Diffstat (limited to 'src/shared/specifier.h')
-rw-r--r-- | src/shared/specifier.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/shared/specifier.h b/src/shared/specifier.h index 839515da42..c433ee2d63 100644 --- a/src/shared/specifier.h +++ b/src/shared/specifier.h @@ -3,7 +3,7 @@ #include "string-util.h" -typedef int (*SpecifierCallback)(char specifier, const void *data, const void *userdata, char **ret); +typedef int (*SpecifierCallback)(char specifier, const void *data, const char *root, const void *userdata, char **ret); typedef struct Specifier { const char specifier; @@ -11,32 +11,32 @@ typedef struct Specifier { const void *data; } Specifier; -int specifier_printf(const char *text, size_t max_length, const Specifier table[], const void *userdata, char **ret); +int specifier_printf(const char *text, size_t max_length, const Specifier table[], const char *root, const void *userdata, char **ret); -int specifier_string(char specifier, const void *data, const void *userdata, char **ret); +int specifier_string(char specifier, const void *data, const char *root, const void *userdata, char **ret); -int specifier_machine_id(char specifier, const void *data, const void *userdata, char **ret); -int specifier_boot_id(char specifier, const void *data, const void *userdata, char **ret); -int specifier_host_name(char specifier, const void *data, const void *userdata, char **ret); -int specifier_short_host_name(char specifier, const void *data, const void *userdata, char **ret); -int specifier_kernel_release(char specifier, const void *data, const void *userdata, char **ret); -int specifier_architecture(char specifier, const void *data, const void *userdata, char **ret); -int specifier_os_id(char specifier, const void *data, const void *userdata, char **ret); -int specifier_os_version_id(char specifier, const void *data, const void *userdata, char **ret); -int specifier_os_build_id(char specifier, const void *data, const void *userdata, char **ret); -int specifier_os_variant_id(char specifier, const void *data, const void *userdata, char **ret); -int specifier_os_image_id(char specifier, const void *data, const void *userdata, char **ret); -int specifier_os_image_version(char specifier, const void *data, const void *userdata, char **ret); +int specifier_machine_id(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_boot_id(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_host_name(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_short_host_name(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_kernel_release(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_architecture(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_os_id(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_os_version_id(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_os_build_id(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_os_variant_id(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_os_image_id(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_os_image_version(char specifier, const void *data, const char *root, const void *userdata, char **ret); -int specifier_group_name(char specifier, const void *data, const void *userdata, char **ret); -int specifier_group_id(char specifier, const void *data, const void *userdata, char **ret); -int specifier_user_name(char specifier, const void *data, const void *userdata, char **ret); -int specifier_user_id(char specifier, const void *data, const void *userdata, char **ret); -int specifier_user_home(char specifier, const void *data, const void *userdata, char **ret); -int specifier_user_shell(char specifier, const void *data, const void *userdata, char **ret); +int specifier_group_name(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_group_id(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_user_name(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_user_id(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_user_home(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_user_shell(char specifier, const void *data, const char *root, const void *userdata, char **ret); -int specifier_tmp_dir(char specifier, const void *data, const void *userdata, char **ret); -int specifier_var_tmp_dir(char specifier, const void *data, const void *userdata, char **ret); +int specifier_tmp_dir(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_var_tmp_dir(char specifier, const void *data, const char *root, const void *userdata, char **ret); /* Typically, in places where one of the above specifier is to be resolved the other similar ones are to be * resolved, too. Hence let's define common macros for the relevant array entries. |