diff options
| author | Dexter Morgan <dmorgan@mageia.org> | 2011-10-28 19:16:33 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-11-02 02:16:39 +0100 |
| commit | 6fdae8a6a40d6a3b5f77516abaee23b3eab002f6 (patch) | |
| tree | 8aaac96449411f44ea67e31c54f00d74fa167a36 /src/vconsole-setup.c | |
| parent | 25d6283acfeb87730c2c0c4c2ef76a66fa397e87 (diff) | |
Add Mageia support
This patch adds support for the Mageia Linux distribution:
http://www.mageia.org/
Mageia is a fork of Mandriva although some divergence has already occured
and thus inclusion of these changes upstream allow us to (hopefully)
migrate more rapidly to the new standard approaches systemd offers.
Indeed, we already use the preferred mechanism of OS identification via
the /etc/os-release file rather than a distro specific variation.
This patch mostly mirrors the patch added previously for Mandriva
support. In addition to those original authors, this patch was mostly
written by Dexter Morgan with help from Colin Guthrie and Eugeni Dodonov.
Diffstat (limited to 'src/vconsole-setup.c')
| -rw-r--r-- | src/vconsole-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c index c5f3628c9b..91967891f1 100644 --- a/src/vconsole-setup.c +++ b/src/vconsole-setup.c @@ -160,7 +160,7 @@ int main(int argc, char **argv) { #ifdef TARGET_GENTOO char *vc_unicode = NULL; #endif -#ifdef TARGET_MANDRIVA +#if defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) char *vc_keytable = NULL; #endif int fd = -1; @@ -371,7 +371,7 @@ int main(int argc, char **argv) { log_warning("Failed to read /etc/conf.d/keymaps: %s", strerror(-r)); } -#elif defined(TARGET_MANDRIVA) +#elif defined(TARGET_MANDRIVA) || defined (TARGET_MAGEIA) if ((r = parse_env_file("/etc/sysconfig/i18n", NEWLINE, "SYSFONT", &vc_font, |