diff options
| author | Michael Biebl <biebl@debian.org> | 2018-09-23 10:10:27 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-09-23 10:10:27 +0200 |
| commit | e126f3e804c35480c4f075777430419d6ece23da (patch) | |
| tree | 5d5821ebcda8cd6ac34d2483bb3354910e508930 /src/nm-hostname-manager.c | |
| parent | c240974325c552cad177c457d6ff04e381fd77a3 (diff) | |
New upstream version 1.12.4 upstream/1.12.4
Diffstat (limited to 'src/nm-hostname-manager.c')
| -rw-r--r-- | src/nm-hostname-manager.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nm-hostname-manager.c b/src/nm-hostname-manager.c index 88ff1604..f569ab86 100644 --- a/src/nm-hostname-manager.c +++ b/src/nm-hostname-manager.c @@ -48,7 +48,8 @@ #define HOSTNAME_FILE_UCASE_HOSTNAME "/etc/HOSTNAME" #define HOSTNAME_FILE_GENTOO "/etc/conf.d/hostname" -#define CONF_DHCP SYSCONFDIR "/sysconfig/network/dhcp" +#define IFCFG_DIR SYSCONFDIR "/sysconfig/network" +#define CONF_DHCP IFCFG_DIR "/dhcp" #if (defined(HOSTNAME_PERSIST_SUSE) + defined(HOSTNAME_PERSIST_SLACKWARE) + defined(HOSTNAME_PERSIST_GENTOO)) > 1 #error "Can only define one of HOSTNAME_PERSIST_*" @@ -102,7 +103,7 @@ NM_DEFINE_SINGLETON_GETTER (NMHostnameManager, nm_hostname_manager_get, NM_TYPE_ /*****************************************************************************/ #if defined(HOSTNAME_PERSIST_GENTOO) -static char * +static gchar * read_hostname_gentoo (const char *path) { gs_free char *contents = NULL; @@ -128,7 +129,7 @@ read_hostname_gentoo (const char *path) #endif #if defined(HOSTNAME_PERSIST_SLACKWARE) -static char * +static gchar * read_hostname_slackware (const char *path) { gs_free char *contents = NULL; |