X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fhostname%2Fhostnamed.c;h=6aa08cacb0385c5aca1af01638c55b30f69850c5;hb=1b9e5b126359a2a2ec37de1f94f046093abc74b8;hp=3f08d1c0ec34fea95c6cf13c4fa53566ac51bebc;hpb=29a07cdb4a317f2e1ea160b79bfe6eb1be2e6e01;p=elogind.git diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index 3f08d1c0e..6aa08cacb 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -123,7 +123,7 @@ static const char* fallback_chassis(void) { int r; char *type; unsigned t; - Virtualization v; + int v; v = detect_virtualization(NULL); @@ -635,18 +635,16 @@ int main(int argc, char *argv[]) { r = context_read_data(&context); if (r < 0) { - log_error("Failed to read timezone data: %s", strerror(-r)); + log_error("Failed to read hostname and machine information: %s", strerror(-r)); goto finish; } - r = bus_event_loop_with_idle(event, bus, "org.freedesktop.hostname1", DEFAULT_EXIT_USEC); + r = bus_event_loop_with_idle(event, bus, "org.freedesktop.hostname1", DEFAULT_EXIT_USEC, NULL, NULL); if (r < 0) { log_error("Failed to run event loop: %s", strerror(-r)); goto finish; } - r = 0; - finish: context_free(&context, bus);