diff options
| author | Leandro A. F. Pereira <leandro@hardinfo.org> | 2019-08-10 16:48:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-10 16:48:51 -0700 |
| commit | b9157b3f6520f46e788157fbfe9753b209efe9b7 (patch) | |
| tree | 80d72e25837f3b569734ba476df84d3462617e29 /modules/computer | |
| parent | 7db082583f72598e2118553faf1ba3206d7c3ee7 (diff) | |
| parent | 4827b88fa34807425640d2a9f07bbf4ac4119ab3 (diff) | |
Merge branch 'master' into usb3
Diffstat (limited to 'modules/computer')
| -rw-r--r-- | modules/computer/ubuntu_flavors.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/computer/ubuntu_flavors.c b/modules/computer/ubuntu_flavors.c index ff64eb56..20e83c82 100644 --- a/modules/computer/ubuntu_flavors.c +++ b/modules/computer/ubuntu_flavors.c @@ -19,9 +19,7 @@ #include <hardinfo.h> #include "distro_flavors.h" - -#include "dt_util.h" /* for appf() */ -#define SEQ(s,m) (g_strcmp0(s, m) == 0) +#include "util_sysobj.h" /* for appfsp() */ static const UbuntuFlavor ubuntu_flavors[] = { { "Vanilla Server", "distros/ubuntu.svg", "https://ubuntu.org", "ubuntu-server" }, @@ -59,7 +57,7 @@ GSList *ubuntu_flavors_scan(void) { gchar *cmd_line = g_strdup("apt-cache policy"); int i; for(i = 0; ubuntu_flavors[i].base.name; i++) { - cmd_line = appf(cmd_line, "%s", ubuntu_flavors[i].package); + cmd_line = appfsp(cmd_line, "%s", ubuntu_flavors[i].package); } if (!i) return NULL; |