summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-10-24 03:51:06 +0200
committerKay Sievers <kay@vrfy.org>2012-10-24 03:51:06 +0200
commitcae356ad49b505a5172d4dbb830d7ec8f32a9953 (patch)
tree2e7adab91b62082447a2d38a560a84bd12920d95 /src/core
parent1ada30ac51736783dbc4dbe971d84d79fec05857 (diff)
remove Fedora hostname, locale, vconsole legacy file support
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hostname-setup.c4
-rw-r--r--src/core/locale-setup.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
index 120024065a..fd111a65a4 100644
--- a/src/core/hostname-setup.c
+++ b/src/core/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_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"
@@ -65,7 +65,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_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
int r;
_cleanup_fclose_ FILE *f = NULL;
diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index 25eb13474a..ec512909ec 100644
--- a/src/core/locale-setup.c
+++ b/src/core/locale-setup.c
@@ -121,7 +121,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_ALTLINUX)
if (r <= 0 &&
(r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
"LANG", &variables[VARIABLE_LANG],