diff options
| author | Lennart Poettering <lennart@poettering.net> | 2024-02-09 09:32:53 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2024-02-09 09:41:19 +0100 |
| commit | 457a74b3d0cfdce9962949b00a9585e00c056578 (patch) | |
| tree | 3f662ea7f756582b1589b07143ef8245a41e3a7b /src/sysext | |
| parent | sysext: fix --help indenting/line breaking (diff) | |
| download | systemd-457a74b3d0cfdce9962949b00a9585e00c056578.tar.xz systemd-457a74b3d0cfdce9962949b00a9585e00c056578.zip | |
sysext: rename "directory_name" field to "full_identifier"
So the field contains simply the full name of the command being invoked,
hence rename the field to match the contents, and to mirror the
"short_identifier" field.
Interestingly, the field is apparently not actually used by anything
though! But we are not going to remove it, since a follow-up commit will
start making use of it.
Diffstat (limited to 'src/sysext')
| -rw-r--r-- | src/sysext/sysext.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c index 260028ccdc..924f461301 100644 --- a/src/sysext/sysext.c +++ b/src/sysext/sysext.c @@ -68,10 +68,11 @@ STATIC_DESTRUCTOR_REGISTER(arg_image_policy, image_policy_freep); /* Helper struct for naming simplicity and reusability */ static const struct { - const char *dot_directory_name; - const char *directory_name; + const char *full_identifier; const char *short_identifier; const char *short_identifier_plural; + const char *dot_directory_name; + const char *directory_name; const char *level_env; const char *scope_env; const char *name_env; @@ -79,10 +80,10 @@ static const struct { unsigned long default_mount_flags; } image_class_info[_IMAGE_CLASS_MAX] = { [IMAGE_SYSEXT] = { - .dot_directory_name = ".systemd-sysext", - .directory_name = "systemd-sysext", + .full_identifier = "systemd-sysext", .short_identifier = "sysext", .short_identifier_plural = "extensions", + .dot_directory_name = ".systemd-sysext", .level_env = "SYSEXT_LEVEL", .scope_env = "SYSEXT_SCOPE", .name_env = "SYSTEMD_SYSEXT_HIERARCHIES", @@ -90,10 +91,10 @@ static const struct { .default_mount_flags = MS_RDONLY|MS_NODEV, }, [IMAGE_CONFEXT] = { - .dot_directory_name = ".systemd-confext", - .directory_name = "systemd-confext", + .full_identifier = "systemd-confext", .short_identifier = "confext", .short_identifier_plural = "confexts", + .dot_directory_name = ".systemd-confext", .level_env = "CONFEXT_LEVEL", .scope_env = "CONFEXT_SCOPE", .name_env = "SYSTEMD_CONFEXT_HIERARCHIES", |