X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fhostname-setup.c;h=dbd2227e212d47464d190eba8a77c43d9de6f4cb;hb=075ff6863d39c8c2846b53e31707605545b1f17e;hp=120024065a036551573b00f3d8ca438eedee2fe1;hpb=2fbe635a83a79f8889afec421ae3990ea106fb91;p=elogind.git diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c index 120024065..dbd2227e2 100644 --- a/src/core/hostname-setup.c +++ b/src/core/hostname-setup.c @@ -30,12 +30,10 @@ #include "util.h" #include "log.h" -#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) +#if defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) #define FILENAME "/etc/sysconfig/network" #elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) #define FILENAME "/etc/HOSTNAME" -#elif defined(TARGET_ARCH) -#define FILENAME "/etc/rc.conf" #elif defined(TARGET_GENTOO) #define FILENAME "/etc/conf.d/hostname" #endif @@ -65,7 +63,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_MAGEIA) +#if defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) int r; _cleanup_fclose_ FILE *f = NULL;