From 1c2033301c6a3364239a487e0276313a1570819c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 12 Jul 2018 10:56:35 +0200 Subject: [PATCH] hostname: drop define IFCFG_DIR which is only used once Also, "src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h" already has a define IFCFG_DIR, but with a different value. We shouldn't name different things the same. --- src/nm-hostname-manager.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/nm-hostname-manager.c b/src/nm-hostname-manager.c index fa6434c7f..88ff1604d 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_*"