chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
53273a6
)
hostname-setup: Frugalware switched to /etc/hostname
author
Miklos Vajna
<vmiklos@frugalware.org>
Tue, 27 Sep 2011 18:45:51 +0000
(20:45 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 11 Oct 2011 00:47:35 +0000
(
02:47
+0200)
src/hostname-setup.c
patch
|
blob
|
history
diff --git
a/src/hostname-setup.c
b/src/hostname-setup.c
index 57db9fbf7c2a2d26a7955ddbb15a9bdc86138961..7216b75c8aa1e1e941c50dd6599a7042fce11d4e 100644
(file)
--- a/
src/hostname-setup.c
+++ b/
src/hostname-setup.c
@@
-32,7
+32,7
@@
#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO)
#define FILENAME "/etc/sysconfig/network"
#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO)
#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"
@@
-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;