diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/hostname-setup.c | 4 | ||||
| -rw-r--r-- | src/locale-setup.c | 4 | ||||
| -rw-r--r-- | src/systemctl.c | 2 | ||||
| -rw-r--r-- | src/util.c | 11 | ||||
| -rw-r--r-- | src/vconsole-setup.c | 4 |
5 files changed, 18 insertions, 7 deletions
diff --git a/src/hostname-setup.c b/src/hostname-setup.c index ab49767045..57db9fbf7c 100644 --- a/src/hostname-setup.c +++ b/src/hostname-setup.c @@ -30,7 +30,7 @@ #include "util.h" #include "log.h" -#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) +#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO) #define FILENAME "/etc/sysconfig/network" #elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) || defined(TARGET_FRUGALWARE) #define FILENAME "/etc/HOSTNAME" @@ -64,7 +64,7 @@ static int read_and_strip_hostname(const char *path, char **hn) { static int read_distro_hostname(char **hn) { -#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) +#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO) int r; FILE *f; diff --git a/src/locale-setup.c b/src/locale-setup.c index 08e289d4ee..d9adfa33f4 100644 --- a/src/locale-setup.c +++ b/src/locale-setup.c @@ -71,7 +71,7 @@ int locale_setup(void) { if (detect_container(NULL) <= 0) if ((r = parse_env_file("/proc/cmdline", WHITESPACE, -#ifdef TARGET_FEDORA +#if defined(TARGET_FEDORA) || defined(TARGET_MEEGO) "LANG", &variables[VARIABLE_LANG], #endif "locale.LANG", &variables[VARIABLE_LANG], @@ -116,7 +116,7 @@ int locale_setup(void) { log_warning("Failed to read /etc/locale.conf: %s", strerror(-r)); } -#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) +#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MEEGO) if (r <= 0 && (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE, "LANG", &variables[VARIABLE_LANG], diff --git a/src/systemctl.c b/src/systemctl.c index 39901c3674..d1d73bfa01 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -4081,7 +4081,7 @@ static int install_info_apply(const char *verb, LookupPaths *paths, InstallInfo } if (!f) { -#if (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA)) && defined (HAVE_SYSV_COMPAT) +#if (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA)) || defined(TARGET_MEEGO) && defined (HAVE_SYSV_COMPAT) if (endswith(i->name, ".service")) { char *sysv; diff --git a/src/util.c b/src/util.c index c2173c7222..5a076e6e34 100644 --- a/src/util.c +++ b/src/util.c @@ -3394,7 +3394,18 @@ void status_welcome(void) { free(s); } } +#elif defined(TARGET_MEEGO) + if (!pretty_name) { + if ((r = read_one_line_file("/etc/meego-release", &pretty_name)) < 0) { + + if (r != -ENOENT) + log_warning("Failed to read /etc/meego-release: %s", strerror(-r)); + } + } + + if (!ansi_color) + const_color = "1;35"; /* Bright Magenta for MeeGo */ #endif if (!pretty_name && !const_pretty) diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c index 67fb7b6100..86e290b5d5 100644 --- a/src/vconsole-setup.c +++ b/src/vconsole-setup.c @@ -178,7 +178,7 @@ int main(int argc, char **argv) { if (detect_container(NULL) <= 0) if ((r = parse_env_file("/proc/cmdline", WHITESPACE, -#ifdef TARGET_FEDORA +#if defined(TARGET_FEDORA) || defined(TARGET_MEEGO) "SYSFONT", &vc_font, "KEYTABLE", &vc_keymap, #endif @@ -209,7 +209,7 @@ int main(int argc, char **argv) { } if (r <= 0) { -#ifdef TARGET_FEDORA +#if defined(TARGET_FEDORA) || defined(TARGET_MEEGO) if ((r = parse_env_file("/etc/sysconfig/i18n", NEWLINE, "SYSFONT", &vc_font, "SYSFONTACM", &vc_font_map, |