Skip to content
Snippets Groups Projects
Unverified Commit 45a4345c authored by Luca Weiss's avatar Luca Weiss
Browse files

hostnamed: init chassis before guessing icon name

We check in guess_icon_name for the configured chassis so we must set
the chassis value first.
parent 1a6e7e0e
Branches main
No related tags found
No related merge requests found
......@@ -680,30 +680,30 @@ hostnamed_init (gboolean _read_only)
err = NULL;
}
icon_name = shell_source_var (machine_info_file, "${ICON_NAME}", &err);
if (icon_name == NULL)
icon_name = g_strdup ("");
chassis = shell_source_var (machine_info_file, "${CHASSIS}", &err);
if (chassis == NULL)
chassis = g_strdup ("");
if (err != NULL) {
g_debug ("%s", err->message);
g_error_free (err);
err = NULL;
}
if (icon_name == NULL || *icon_name == 0) {
g_free (icon_name);
icon_name = guess_icon_name ();
if (chassis == NULL || *chassis == 0) {
g_free (chassis);
chassis = guess_chassis ();
}
chassis = shell_source_var (machine_info_file, "${CHASSIS}", &err);
if (chassis == NULL)
chassis = g_strdup ("");
icon_name = shell_source_var (machine_info_file, "${ICON_NAME}", &err);
if (icon_name == NULL)
icon_name = g_strdup ("");
if (err != NULL) {
g_debug ("%s", err->message);
g_error_free (err);
err = NULL;
}
if (chassis == NULL || *chassis == 0) {
g_free (chassis);
chassis = guess_chassis ();
if (icon_name == NULL || *icon_name == 0) {
g_free (icon_name);
icon_name = guess_icon_name ();
}
deployment = shell_source_var (machine_info_file, "${DEPLOYMENT}", &err);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment