SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #28049 from bluca/portablectl_flags

Browse Source 
portable: fix silly typo in D-Bus interface name, use only new(er) methods from portablectl
This commit is contained in:
Luca Boccassi
2023-06-16 17:44:34 +01:00
committed by GitHub
parent 5ed91481ab c18f4eb9e9
commit b79f29cd2b
3 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/org.freedesktop.portable1.xml
+10 -10
View File
@@ -380,13 +380,13 @@ node /org/freedesktop/portable1 {
in s copy_mode,
out a(sss) changes_removed,
out a(sss) changes_updated);
ReattacheWithExtensions(in as extensions,
in as matches,
in s profile,
in s copy_mode,
in t flags,
out a(sss) changes_removed,
out a(sss) changes_updated);
ReattachWithExtensions(in as extensions,
in as matches,
in s profile,
in s copy_mode,
in t flags,
out a(sss) changes_removed,
out a(sss) changes_updated);
Remove();
MarkReadOnly(in b read_only);
SetLimit(in t limit);
@@ -438,7 +438,7 @@ node /org/freedesktop/portable1 {
<!--method Reattach is not documented!-->
<!--method ReattacheWithExtensions is not documented!-->
<!--method ReattachWithExtensions is not documented!-->
<!--method Remove is not documented!-->
@@ -472,7 +472,7 @@ node /org/freedesktop/portable1 {
<variablelist class="dbus-method" generated="True" extra-ref="Reattach()"/>
<variablelist class="dbus-method" generated="True" extra-ref="ReattacheWithExtensions()"/>
<variablelist class="dbus-method" generated="True" extra-ref="ReattachWithExtensions()"/>
<variablelist class="dbus-method" generated="True" extra-ref="Remove()"/>
@@ -530,7 +530,7 @@ node /org/freedesktop/portable1 {
<listitem><para>Reattach()</para></listitem>
<listitem><para>ReattacheWithExtensions()</para></listitem>
<listitem><para>ReattachWithExtensions()</para></listitem>
<listitem><para>Remove()</para></listitem>
src/portable/portablectl.c
+4 -4
View File
@@ -264,7 +264,7 @@ static int get_image_metadata(sd_bus *bus, const char *image, char **matches, sd
assert(bus);
assert(reply);
method = strv_isempty(arg_extension_images) ? "GetImageMetadata" : "GetImageMetadataWithExtensions";
method = strv_isempty(arg_extension_images) && !arg_force ? "GetImageMetadata" : "GetImageMetadataWithExtensions";
r = bus_message_new_method_call(bus, &m, bus_portable_mgr, method);
if (r < 0)
@@ -907,11 +907,11 @@ static int attach_reattach_image(int argc, char *argv[], const char *method) {
}
static int attach_image(int argc, char *argv[], void *userdata) {
return attach_reattach_image(argc, argv, strv_isempty(arg_extension_images) ? "AttachImage" : "AttachImageWithExtensions");
return attach_reattach_image(argc, argv, strv_isempty(arg_extension_images) && !arg_force ? "AttachImage" : "AttachImageWithExtensions");
}
static int reattach_image(int argc, char *argv[], void *userdata) {
return attach_reattach_image(argc, argv, strv_isempty(arg_extension_images) ? "ReattachImage" : "ReattachImageWithExtensions");
return attach_reattach_image(argc, argv, strv_isempty(arg_extension_images) && !arg_force ? "ReattachImage" : "ReattachImageWithExtensions");
}
static int detach_image(int argc, char *argv[], void *userdata) {
@@ -934,7 +934,7 @@ static int detach_image(int argc, char *argv[], void *userdata) {
(void) maybe_stop_disable(bus, image, argv);
method = strv_isempty(arg_extension_images) ? "DetachImage" : "DetachImageWithExtensions";
method = strv_isempty(arg_extension_images) && !arg_force ? "DetachImage" : "DetachImageWithExtensions";
r = bus_message_new_method_call(bus, &m, bus_portable_mgr, method);
if (r < 0)
src/portable/portabled-image-bus.c
+12 -1
View File
@@ -934,7 +934,7 @@ const sd_bus_vtable image_vtable[] = {
"a(sss)", changes_updated),
bus_image_method_reattach,
SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD_WITH_ARGS("ReattacheWithExtensions",
SD_BUS_METHOD_WITH_ARGS("ReattachWithExtensions",
SD_BUS_ARGS("as", extensions,
"as", matches,
"s", profile,
@@ -959,6 +959,17 @@ const sd_bus_vtable image_vtable[] = {
SD_BUS_NO_RESULT,
bus_image_method_set_limit,
SD_BUS_VTABLE_UNPRIVILEGED),
/* Deprecated silly typo */
SD_BUS_METHOD_WITH_ARGS("ReattacheWithExtensions",
SD_BUS_ARGS("as", extensions,
"as", matches,
"s", profile,
"s", copy_mode,
"t", flags),
SD_BUS_RESULT("a(sss)", changes_removed,
"a(sss)", changes_updated),
bus_image_method_reattach,
SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_HIDDEN),
SD_BUS_VTABLE_END
};