From: Dave Reisner <dreisner@archlinux.org>
Date: Sun, 4 Nov 2012 00:11:52 +0000 (-0400)
Subject: drop Arch Linux support for reading /etc/rc.conf
X-Git-Tag: v196~141
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=075ff6863d39c8c2846b53e31707605545b1f17e;hp=53d05b44f17db67d644069600e4b5bbca88d21e7;p=elogind.git

drop Arch Linux support for reading /etc/rc.conf
---

diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
index fd111a65a..dbd2227e2 100644
--- a/src/core/hostname-setup.c
+++ b/src/core/hostname-setup.c
@@ -34,8 +34,6 @@
 #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_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;