diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-04-04 05:59:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-04 05:59:04 +0200 |
| commit | 482882b7b725e44c214ee384c9e984f452124164 (patch) | |
| tree | daa624808ad5702bc4475a82c52cb1b41c8831a1 | |
| parent | udevadm: drop unused option (diff) | |
| parent | portabled: fix method name (diff) | |
| download | systemd-482882b7b725e44c214ee384c9e984f452124164.tar.xz systemd-482882b7b725e44c214ee384c9e984f452124164.zip | |
Merge pull request #12207 from poettering/portable-bus-policy-fix
portabled dbus policy fix
| -rw-r--r-- | src/portable/org.freedesktop.portable1.conf | 6 | ||||
| -rw-r--r-- | src/portable/portabled-bus.c | 2 | ||||
| -rw-r--r-- | src/portable/portabled-image-bus.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/portable/org.freedesktop.portable1.conf b/src/portable/org.freedesktop.portable1.conf index 4c20a886e6..31d41af12a 100644 --- a/src/portable/org.freedesktop.portable1.conf +++ b/src/portable/org.freedesktop.portable1.conf @@ -47,7 +47,7 @@ <allow send_destination="org.freedesktop.portable1" send_interface="org.freedesktop.portable1.Manager" - send_member="GetImageUnitFiles"/> + send_member="GetImageMetadata"/> <allow send_destination="org.freedesktop.portable1" send_interface="org.freedesktop.portable1.Manager" @@ -85,11 +85,11 @@ <allow send_destination="org.freedesktop.portable1" send_interface="org.freedesktop.portable1.Image" - send_member="GetUnitFiles"/> + send_member="GetMetadata"/> <allow send_destination="org.freedesktop.portable1" send_interface="org.freedesktop.portable1.Image" - send_member="GetImageState"/> + send_member="GetState"/> <allow send_destination="org.freedesktop.portable1" send_interface="org.freedesktop.portable1.Image" diff --git a/src/portable/portabled-bus.c b/src/portable/portabled-bus.c index 3cbdb0b0cc..89168c3c43 100644 --- a/src/portable/portabled-bus.c +++ b/src/portable/portabled-bus.c @@ -359,8 +359,8 @@ const sd_bus_vtable manager_vtable[] = { SD_BUS_METHOD("GetImage", "s", "o", method_get_image, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("ListImages", NULL, "a(ssbtttso)", method_list_images, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("GetImageOSRelease", "s", "a{ss}", method_get_image_os_release, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD("GetImageState", "s", "s", method_get_image_state, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("GetImageMetadata", "sas", "saya{say}", method_get_image_metadata, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("GetImageState", "s", "s", method_get_image_state, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("AttachImage", "sassbs", "a(sss)", method_attach_image, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("DetachImage", "sb", "a(sss)", method_detach_image, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("RemoveImage", "s", NULL, method_remove_image, SD_BUS_VTABLE_UNPRIVILEGED), diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c index 2f19b48fe2..fd2b7c9994 100644 --- a/src/portable/portabled-image-bus.c +++ b/src/portable/portabled-image-bus.c @@ -528,7 +528,7 @@ const sd_bus_vtable image_vtable[] = { SD_BUS_PROPERTY("UsageExclusive", "t", NULL, offsetof(Image, usage_exclusive), 0), SD_BUS_PROPERTY("LimitExclusive", "t", NULL, offsetof(Image, limit_exclusive), 0), SD_BUS_METHOD("GetOSRelease", NULL, "a{ss}", bus_image_method_get_os_release, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD("GetMedatadata", "as", "saya{say}", bus_image_method_get_metadata, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("GetMetadata", "as", "saya{say}", bus_image_method_get_metadata, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("GetState", NULL, "s", bus_image_method_get_state, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("Attach", "assbs", "a(sss)", bus_image_method_attach, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("Detach", "b", "a(sss)", bus_image_method_detach, SD_BUS_VTABLE_UNPRIVILEGED), |