bus_name = g_dbus_method_invocation_get_sender(invoc);
/* verify caller has correct permissions via polkit */
- is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.SetHostname", policykit_auth);
+ is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.set-hostname", policykit_auth);
switch(is_authed) {
bus_name = g_dbus_method_invocation_get_sender(invoc);
/* verify caller has correct permissions via polkit */
- is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.SetStaticHostname", policykit_auth);
+ is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.set-static-hostname", policykit_auth);
switch(is_authed) {
} else {
g_strdelimit(STATIC_HOSTNAME, " ", '-');
- hostname1_set_static_hostname(hn1_passed_interf, STATIC_HOSTNAME);
+ hostname1_set_static_hostname(hn1_passed_interf, STATIC_HOSTNAME);
g_ptr_array_add(hostnamed_freeable, valid_static_hostname_buf);
- ret = TRUE;
+ ret = (!sethostname(valid_static_hostname_buf, MAXHOSTNAMELEN)) ? TRUE : FALSE; /* TODO set /etc/myname, guarantee domain or substitue .home.network" */
hostname1_complete_set_static_hostname(hn1_passed_interf, invoc);
}
}
bus_name = g_dbus_method_invocation_get_sender(invoc);
/* verify caller has correct permissions via polkit */
- is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.SetPrettyHostname", policykit_auth);
+ is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.set-pretty-hostname", policykit_auth);
switch(is_authed) {
hostname1_complete_set_pretty_hostname(hn1_passed_interf, invoc);
ret = TRUE;
- if(g_key_file_load_from_file(config, "/etc/systemd_compat.conf", G_KEY_FILE_NONE, NULL)) {
+ if(g_key_file_load_from_file(config, "/etc/machine-info", G_KEY_FILE_NONE, NULL)) {
- g_key_file_set_string(config, "hostnamed", "PrettyHostname", valid_pretty_hostname_buf);
+ g_key_file_set_string(config, "hostnamed", "PRETTY_HOSTNAME", valid_pretty_hostname_buf);
- if((computed_static_hostname = g_hostname_to_ascii(PRETTY_HOSTNAME))) {
+ /* if((computed_static_hostname = g_hostname_to_ascii(PRETTY_HOSTNAME))) {
g_strdelimit(computed_static_hostname, " ", '-');
hostname1_set_static_hostname(hn1_passed_interf, computed_static_hostname);
g_ptr_array_add(hostnamed_freeable, computed_static_hostname);
g_key_file_set_string(config, "hostnamed", "StaticHostname", computed_static_hostname);
- } else
- g_free(computed_static_hostname);
+ } */
}
-
}
}
- g_key_file_save_to_file(config, "/etc/systemd_compat.conf", NULL);
+ g_key_file_save_to_file(config, "/etc/machine-info", NULL);
g_key_file_unref(config);
return ret;
g_strlcpy(valid_chassis_name_buf, proposed_chassis_name, (gsize)64);
/* verify caller has correct permissions via polkit */
- is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.SetChassis", policykit_auth);
+ is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.set-chassis", policykit_auth);
switch(is_authed) {
g_ptr_array_add(hostnamed_freeable, valid_chassis_name_buf);
hostname1_complete_set_chassis(hn1_passed_interf, invoc);
- if(g_key_file_load_from_file(config, "/etc/systemd_compat.conf", G_KEY_FILE_NONE, NULL)) {
+ if(g_key_file_load_from_file(config, "/etc/machine-info", G_KEY_FILE_NONE, NULL)) {
ret = TRUE;
g_key_file_set_string(config, "hostnamed", "ChassisType", valid_chassis_name_buf);
}
}
- g_key_file_save_to_file(config, "/etc/systemd_compat.conf", NULL);
+ g_key_file_save_to_file(config, "/etc/machine-info", NULL);
g_key_file_unref(config);
return ret;
bus_name = g_dbus_method_invocation_get_sender(invoc);
/* verify caller has correct permissions via polkit */
- is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.SetIconName", policykit_auth);
+ is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.set-icon-name", policykit_auth);
switch(is_authed) {
g_ptr_array_add(hostnamed_freeable, valid_icon_name_buf);
hostname1_complete_set_icon_name(hn1_passed_interf, invoc);
- if(g_key_file_load_from_file(config, "/etc/systemd_compat.conf", G_KEY_FILE_NONE, NULL)) {
+ if(g_key_file_load_from_file(config, "/etc/machine-info", G_KEY_FILE_NONE, NULL)) {
ret = TRUE;
g_key_file_set_string(config, "hostnamed", "IconName", valid_icon_name_buf);
}
}
- g_key_file_save_to_file(config, "/etc/systemd_compat.conf", NULL);
+ g_key_file_save_to_file(config, "/etc/machine-info", NULL);
g_key_file_unref(config);
return ret;
const gchar *
our_get_os_cpename() {
- return "ONEDAY";
+ /* XXX needs to parse /etc/os-release (fallback to /usr/local/lib/os-release) */
+ return "";
}
const gchar *
strncpy(ret, hostname_buf, hostname_divider); */
/* (3) set PRETTY_HOSTNAME */
- if(g_key_file_load_from_file(config, "/etc/systemd_compat.conf", G_KEY_FILE_NONE, NULL)
- && (pretty_hostname_buf = g_key_file_get_value(config, "hostnamed", "PrettyHostname", NULL)))
+ if(g_key_file_load_from_file(config, "/etc/machine-info", G_KEY_FILE_NONE, NULL)
+ && (pretty_hostname_buf = g_key_file_get_value(config, "hostnamed", "PRETTY_HOSTNAME", NULL)))
PRETTY_HOSTNAME = pretty_hostname_buf;
else
PRETTY_HOSTNAME = "";
- if(config)
- g_key_file_unref(config);
+
+ /* (4) set STATIC_HOSTNAME */
+ if((static_hostname_buf = g_key_file_get_value(config, "hostnamed", "STATIC_HOSTNAME", NULL)))
+ STATIC_HOSTNAME = static_hostname_buf;
- /* (4) set STATIC_HOSTNAME */
- if(!g_strcmp0(PRETTY_HOSTNAME, ""))
- STATIC_HOSTNAME = HOSTNAME;
+ else
+ STATIC_HOSTNAME = "";
- else if((static_hostname_buf = g_hostname_to_ascii(PRETTY_HOSTNAME)))
- STATIC_HOSTNAME = static_hostname_buf;
+ if(config)
+ g_key_file_unref(config);
return (HOSTNAME && STATIC_HOSTNAME && PRETTY_HOSTNAME) ? TRUE : FALSE;
-
}
gboolean set_uname_properties() {