chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dev: use /dev/.run/systemd as runtime directory, instead of /dev/.systemd
[elogind.git]
/
src
/
hostname-setup.c
diff --git
a/src/hostname-setup.c
b/src/hostname-setup.c
index ce7d2a1c1194b5c4f653ba6be3b2b3b596e77c42..ef68d783953d3e2fc8894f8c6db996d058651258 100644
(file)
--- a/
src/hostname-setup.c
+++ b/
src/hostname-setup.c
@@
-30,9
+30,9
@@
#include "util.h"
#include "log.h"
#include "util.h"
#include "log.h"
-#if defined(TARGET_FEDORA)
+#if defined(TARGET_FEDORA)
|| defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA)
#define FILENAME "/etc/sysconfig/network"
#define FILENAME "/etc/sysconfig/network"
-#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
+#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
|| defined(TARGET_FRUGALWARE)
#define FILENAME "/etc/HOSTNAME"
#elif defined(TARGET_ARCH)
#define FILENAME "/etc/rc.conf"
#define FILENAME "/etc/HOSTNAME"
#elif defined(TARGET_ARCH)
#define FILENAME "/etc/rc.conf"
@@
-87,7
+87,7
@@
static int read_and_strip_hostname(const char *path, char **hn) {
static int read_distro_hostname(char **hn) {
static int read_distro_hostname(char **hn) {
-#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO)
+#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO)
|| defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA)
int r;
FILE *f;
int r;
FILE *f;
@@
-137,7
+137,7
@@
finish:
fclose(f);
return r;
fclose(f);
return r;
-#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
+#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
|| defined(TARGET_FRUGALWARE)
return read_and_strip_hostname(FILENAME, hn);
#else
return -ENOENT;
return read_and_strip_hostname(FILENAME, hn);
#else
return -ENOENT;