chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: add StartLimitInterval/StartLimitBurst/StartLimitAction
[elogind.git]
/
src
/
hostname-setup.c
diff --git
a/src/hostname-setup.c
b/src/hostname-setup.c
index 57db9fbf7c2a2d26a7955ddbb15a9bdc86138961..2c2f10cfd15486b872cbea6185becbbcb0496b4a 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) || 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"
#define FILENAME "/etc/sysconfig/network"
-#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
|| defined(TARGET_FRUGALWARE)
+#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
#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"
@@
-64,7
+64,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) || 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;
int r;
FILE *f;
@@
-114,7
+114,7
@@
finish:
fclose(f);
return r;
fclose(f);
return r;
-#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
|| defined(TARGET_FRUGALWARE)
+#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
return read_and_strip_hostname(FILENAME, hn);
#else
return -ENOENT;
return read_and_strip_hostname(FILENAME, hn);
#else
return -ENOENT;