diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:52:15 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:24:27 +0100 |
| commit | e8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (patch) | |
| tree | 017883e210043859ee695250f6285380b795f8e4 /src/nm-hostname-manager.c | |
| parent | b05c072fe2594e0369cbfb00a3fba176d2d309dc (diff) | |
| parent | 1b878e595ff7be634a4800ca6cc506046e49548e (diff) | |
Merge remote-tracking branch 'salsa/master' into disco
Diffstat (limited to 'src/nm-hostname-manager.c')
| -rw-r--r-- | src/nm-hostname-manager.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/nm-hostname-manager.c b/src/nm-hostname-manager.c index f569ab86..88ff1604 100644 --- a/src/nm-hostname-manager.c +++ b/src/nm-hostname-manager.c @@ -48,8 +48,7 @@ #define HOSTNAME_FILE_UCASE_HOSTNAME "/etc/HOSTNAME" #define HOSTNAME_FILE_GENTOO "/etc/conf.d/hostname" -#define IFCFG_DIR SYSCONFDIR "/sysconfig/network" -#define CONF_DHCP IFCFG_DIR "/dhcp" +#define CONF_DHCP SYSCONFDIR "/sysconfig/network/dhcp" #if (defined(HOSTNAME_PERSIST_SUSE) + defined(HOSTNAME_PERSIST_SLACKWARE) + defined(HOSTNAME_PERSIST_GENTOO)) > 1 #error "Can only define one of HOSTNAME_PERSIST_*" @@ -103,7 +102,7 @@ NM_DEFINE_SINGLETON_GETTER (NMHostnameManager, nm_hostname_manager_get, NM_TYPE_ /*****************************************************************************/ #if defined(HOSTNAME_PERSIST_GENTOO) -static gchar * +static char * read_hostname_gentoo (const char *path) { gs_free char *contents = NULL; @@ -129,7 +128,7 @@ read_hostname_gentoo (const char *path) #endif #if defined(HOSTNAME_PERSIST_SLACKWARE) -static gchar * +static char * read_hostname_slackware (const char *path) { gs_free char *contents = NULL; |