diff options
author | Lennart Poettering <lennart@poettering.net> | 2023-04-12 14:27:20 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2023-04-12 14:54:44 +0200 |
commit | 4f25844a4bc5e20a0c734be6cdd605ed680c7d44 (patch) | |
tree | 597db3ed3c01fab99b56c384e88e435b07755432 /src/sysext | |
parent | b151e69671c8cb01eba1f7969bf1aa63d9f87eb3 (diff) | |
download | systemd-4f25844a4bc5e20a0c734be6cdd605ed680c7d44.tar.gz |
sysext: define a default image dissection policy for confext images
Diffstat (limited to 'src/sysext')
-rw-r--r-- | src/sysext/sysext.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c index 3fc6b910c4..df4092fea9 100644 --- a/src/sysext/sysext.c +++ b/src/sysext/sysext.c @@ -63,6 +63,7 @@ static const struct { const char *level_env; const char *scope_env; const char *name_env; + const ImagePolicy *default_image_policy; } image_class_info[_IMAGE_CLASS_MAX] = { [IMAGE_SYSEXT] = { .dot_directory_name = ".systemd-sysext", @@ -72,6 +73,7 @@ static const struct { .level_env = "SYSEXT_LEVEL", .scope_env = "SYSEXT_SCOPE", .name_env = "SYSTEMD_SYSEXT_HIERARCHIES", + .default_image_policy = &image_policy_sysext, }, [IMAGE_CONFEXT] = { .dot_directory_name = ".systemd-confext", @@ -81,6 +83,7 @@ static const struct { .level_env = "CONFEXT_LEVEL", .scope_env = "CONFEXT_SCOPE", .name_env = "SYSTEMD_CONFEXT_HIERARCHIES", + .default_image_policy = &image_policy_confext, } }; @@ -458,7 +461,7 @@ static const ImagePolicy *pick_image_policy(const Image *img) { if (in_initrd() && path_startswith(img->path, "/.extra/sysext/")) return &image_policy_sysext_strict; - return &image_policy_sysext; + return image_class_info[img->class].default_image_policy; } static int merge_subprocess(Hashmap *images, const char *workspace) { |