diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-11-08 19:44:16 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-11-08 19:44:16 +0100 |
| commit | 1e2579fdeb7608719cb28da0b5061f48ba0efc34 (patch) | |
| tree | 83352697294bd24015efdce199e8fbc3d2788f6e /src/hostname-setup.c | |
| parent | a40593a0d0d740efa387e35411e1e456a6c5aba7 (diff) | |
| parent | 4cbd9ecf45f64c3a9acc99d473fbf3be3687ae24 (diff) | |
Merge branch 'master' into journal
Diffstat (limited to 'src/hostname-setup.c')
| -rw-r--r-- | src/hostname-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/hostname-setup.c b/src/hostname-setup.c index 7216b75c8a..2c2f10cfd1 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) || defined(TARGET_MEEGO) +#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO) || defined(TARGET_MAGEIA) #define FILENAME "/etc/sysconfig/network" #elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) #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) || defined(TARGET_MEEGO) +#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO) || defined(TARGET_MAGEIA) int r; FILE *f; |