sysupdate.d: Add way to drop binaries into $BOOT

As described in the BLS, we should place binaries into the XBOOTLDR
directory if it is available, otherwise into the ESP. Thus, we might
need to put binaries into /boot or into /efi depending on the existence
of the XBOOTLDR partition.

With this change, we introduce a new PathRelativeTo= config option that
makes this functionality possible

1 files changed, 26 insertions, 22 deletions

diff --git a/src/sysupdate/sysupdate-transfer.c b/src/sysupdate/sysupdate-transfer.c
index f7009315a2..bbc3a5bcaa 100644
--- a/src/sysupdate/sysupdate-transfer.c
+++ b/src/sysupdate/sysupdate-transfer.c
@@ -297,7 +297,6 @@ static int config_parse_resource_path(
                 const char *rvalue,
                 void *data,
                 void *userdata) {
-
         _cleanup_free_ char *resolved = NULL;
         Resource *rr = ASSERT_PTR(data);
         int r;
@@ -327,6 +326,9 @@ static int config_parse_resource_path(
 
 static DEFINE_CONFIG_PARSE_ENUM(config_parse_resource_type, resource_type, ResourceType, "Invalid resource type");
 
+static DEFINE_CONFIG_PARSE_ENUM_WITH_DEFAULT(config_parse_resource_path_relto, path_relative_to, PathRelativeTo,
+                                             PATH_RELATIVE_TO_ROOT, "Invalid PathRelativeTo= value");
+
 static int config_parse_resource_ptype(
                 const char *unit,
                 const char *filename,
@@ -418,27 +420,29 @@ int transfer_read_definition(Transfer *t, const char *path) {
         assert(path);
 
         ConfigTableItem table[] = {
-                { "Transfer",    "MinVersion",              config_parse_min_version,          0, &t->min_version        },
-                { "Transfer",    "ProtectVersion",          config_parse_protect_version,      0, &t->protected_versions },
-                { "Transfer",    "Verify",                  config_parse_bool,                 0, &t->verify             },
-                { "Source",      "Type",                    config_parse_resource_type,        0, &t->source.type        },
-                { "Source",      "Path",                    config_parse_resource_path,        0, &t->source             },
-                { "Source",      "MatchPattern",            config_parse_resource_pattern,     0, &t->source.patterns    },
-                { "Target",      "Type",                    config_parse_resource_type,        0, &t->target.type        },
-                { "Target",      "Path",                    config_parse_resource_path,        0, &t->target             },
-                { "Target",      "MatchPattern",            config_parse_resource_pattern,     0, &t->target.patterns    },
-                { "Target",      "MatchPartitionType",      config_parse_resource_ptype,       0, &t->target             },
-                { "Target",      "PartitionUUID",           config_parse_partition_uuid,       0, t                      },
-                { "Target",      "PartitionFlags",          config_parse_partition_flags,      0, t                      },
-                { "Target",      "PartitionNoAuto",         config_parse_tristate,             0, &t->no_auto            },
-                { "Target",      "PartitionGrowFileSystem", config_parse_tristate,             0, &t->growfs             },
-                { "Target",      "ReadOnly",                config_parse_tristate,             0, &t->read_only          },
-                { "Target",      "Mode",                    config_parse_mode,                 0, &t->mode               },
-                { "Target",      "TriesLeft",               config_parse_uint64,               0, &t->tries_left         },
-                { "Target",      "TriesDone",               config_parse_uint64,               0, &t->tries_done         },
-                { "Target",      "InstancesMax",            config_parse_instances_max,        0, &t->instances_max      },
-                { "Target",      "RemoveTemporary",         config_parse_bool,                 0, &t->remove_temporary   },
-                { "Target",      "CurrentSymlink",          config_parse_current_symlink,      0, &t->current_symlink    },
+                { "Transfer",    "MinVersion",              config_parse_min_version,          0, &t->min_version             },
+                { "Transfer",    "ProtectVersion",          config_parse_protect_version,      0, &t->protected_versions      },
+                { "Transfer",    "Verify",                  config_parse_bool,                 0, &t->verify                  },
+                { "Source",      "Type",                    config_parse_resource_type,        0, &t->source.type             },
+                { "Source",      "Path",                    config_parse_resource_path,        0, &t->source                  },
+                { "Source",      "PathRelativeTo",          config_parse_resource_path_relto,  0, &t->source.path_relative_to },
+                { "Source",      "MatchPattern",            config_parse_resource_pattern,     0, &t->source.patterns         },
+                { "Target",      "Type",                    config_parse_resource_type,        0, &t->target.type             },
+                { "Target",      "Path",                    config_parse_resource_path,        0, &t->target                  },
+                { "Target",      "PathRelativeTo",          config_parse_resource_path_relto,  0, &t->target.path_relative_to },
+                { "Target",      "MatchPattern",            config_parse_resource_pattern,     0, &t->target.patterns         },
+                { "Target",      "MatchPartitionType",      config_parse_resource_ptype,       0, &t->target                  },
+                { "Target",      "PartitionUUID",           config_parse_partition_uuid,       0, t                           },
+                { "Target",      "PartitionFlags",          config_parse_partition_flags,      0, t                           },
+                { "Target",      "PartitionNoAuto",         config_parse_tristate,             0, &t->no_auto                 },
+                { "Target",      "PartitionGrowFileSystem", config_parse_tristate,             0, &t->growfs                  },
+                { "Target",      "ReadOnly",                config_parse_tristate,             0, &t->read_only               },
+                { "Target",      "Mode",                    config_parse_mode,                 0, &t->mode                    },
+                { "Target",      "TriesLeft",               config_parse_uint64,               0, &t->tries_left              },
+                { "Target",      "TriesDone",               config_parse_uint64,               0, &t->tries_done              },
+                { "Target",      "InstancesMax",            config_parse_instances_max,        0, &t->instances_max           },
+                { "Target",      "RemoveTemporary",         config_parse_bool,                 0, &t->remove_temporary        },
+                { "Target",      "CurrentSymlink",          config_parse_current_symlink,      0, &t->current_symlink         },
                 {}
         };