diff --git a/man/org.freedesktop.sysupdate1.xml b/man/org.freedesktop.sysupdate1.xml index ac0e9152a13..329fab8635d 100644 --- a/man/org.freedesktop.sysupdate1.xml +++ b/man/org.freedesktop.sysupdate1.xml @@ -180,11 +180,11 @@ node /org/freedesktop/sysupdate1/target/host { Describe() returns all known information about a given version as a JSON object. The version argument is used to pass the version to be described. Additional options may be passed through the flags argument. The only supported value currently - is SD_SYSTEMD_SYSUPDATE_OFFLINE, which prevents the call from accessing the network + is SD_SYSUPDATE_OFFLINE, which prevents the call from accessing the network and restricts results to locally installed versions. This flag is defined as follows: -#define SD_SYSTEMD_SYSUPDATE_OFFLINE (UINT64_C(1) << 0) +#define SD_SYSUPDATE_OFFLINE (UINT64_C(1) << 0) The returned JSON object contains several known keys. More keys may be added in the future. The @@ -327,8 +327,8 @@ node /org/freedesktop/sysupdate1/target/host { class contains the class of the Target being acted upon, and name contains the name of the same Target. Additionally, each method exposes its arguments to the rule. Arguments containing flags are unwrapped into a variable-per-flag; for example, the - SD_SYSTEMD_SYSUPDATE_OFFLINE flag is exposed as a variable named - offline. + SD_SYSUPDATE_OFFLINE flag is exposed as a variable named offline. + diff --git a/src/sysupdate/sysupdate-util.h b/src/sysupdate/sysupdate-util.h index 56339a87b15..989e0693297 100644 --- a/src/sysupdate/sysupdate-util.h +++ b/src/sysupdate/sysupdate-util.h @@ -4,4 +4,4 @@ int reboot_now(void); -#define SD_SYSTEMD_SYSUPDATE_OFFLINE (UINT64_C(1) << 0) +#define SD_SYSUPDATE_OFFLINE (UINT64_C(1) << 0) diff --git a/src/sysupdate/sysupdated.c b/src/sysupdate/sysupdated.c index 776211f74b4..83295fe0d96 100644 --- a/src/sysupdate/sysupdated.c +++ b/src/sysupdate/sysupdated.c @@ -856,7 +856,7 @@ static int target_method_list(sd_bus_message *msg, void *userdata, sd_bus_error const char *details[] = { "class", target_class_to_string(t->class), "name", t->name, - "offline", one_zero(FLAGS_SET(flags, SD_SYSTEMD_SYSUPDATE_OFFLINE)), + "offline", one_zero(FLAGS_SET(flags, SD_SYSUPDATE_OFFLINE)), NULL }; @@ -875,7 +875,7 @@ static int target_method_list(sd_bus_message *msg, void *userdata, sd_bus_error if (r < 0) return r; - j->offline = FLAGS_SET(flags, SD_SYSTEMD_SYSUPDATE_OFFLINE); + j->offline = FLAGS_SET(flags, SD_SYSUPDATE_OFFLINE); r = job_start(j); if (r < 0) @@ -922,7 +922,7 @@ static int target_method_describe(sd_bus_message *msg, void *userdata, sd_bus_er "class", target_class_to_string(t->class), "name", t->name, "version", version, - "offline", one_zero(FLAGS_SET(flags, SD_SYSTEMD_SYSUPDATE_OFFLINE)), + "offline", one_zero(FLAGS_SET(flags, SD_SYSUPDATE_OFFLINE)), NULL }; @@ -945,7 +945,7 @@ static int target_method_describe(sd_bus_message *msg, void *userdata, sd_bus_er if (!j->version) return log_oom(); - j->offline = FLAGS_SET(flags, SD_SYSTEMD_SYSUPDATE_OFFLINE); + j->offline = FLAGS_SET(flags, SD_SYSUPDATE_OFFLINE); r = job_start(j); if (r < 0) diff --git a/src/sysupdate/updatectl.c b/src/sysupdate/updatectl.c index 39957ea1a01..151fa9e1d7a 100644 --- a/src/sysupdate/updatectl.c +++ b/src/sysupdate/updatectl.c @@ -430,7 +430,7 @@ static int list_versions(sd_bus *bus, const char *target_path) { &error, &reply, "t", - arg_offline ? SD_SYSTEMD_SYSUPDATE_OFFLINE : 0); + arg_offline ? SD_SYSUPDATE_OFFLINE : 0); if (r < 0) return log_bus_error(r, &error, NULL, "call List"); @@ -473,7 +473,7 @@ static int list_versions(sd_bus *bus, const char *target_path) { op, "st", *version, - arg_offline ? SD_SYSTEMD_SYSUPDATE_OFFLINE : 0); + arg_offline ? SD_SYSUPDATE_OFFLINE : 0); if (r < 0) return log_error_errno(r, "Failed to call Describe: %m"); TAKE_PTR(op); @@ -508,7 +508,7 @@ static int describe(sd_bus *bus, const char *target_path, const char *version) { &reply, "st", version, - arg_offline ? SD_SYSTEMD_SYSUPDATE_OFFLINE : 0); + arg_offline ? SD_SYSUPDATE_OFFLINE : 0); if (r < 0) return log_bus_error(r, &error, NULL, "call Describe"); @@ -707,7 +707,7 @@ static int check_finished(sd_bus_message *reply, void *userdata, sd_bus_error *r op, "st", new_version, - arg_offline ? SD_SYSTEMD_SYSUPDATE_OFFLINE : 0); + arg_offline ? SD_SYSUPDATE_OFFLINE : 0); if (r < 0) return log_error_errno(r, "Failed to call Describe: %m"); TAKE_PTR(op);