diff options
| author | Michael Biebl <biebl@debian.org> | 2016-04-06 00:47:13 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-04-06 00:47:13 +0200 |
| commit | 45bb35bff2a8d258aff2c1d9b68cce1787c7da62 (patch) | |
| tree | e9da08b1d189befb839889185b4f3304d389a60f /src/settings/nm-settings.c | |
| parent | d101696d539cd03172badbcde19e9a13e5707ee1 (diff) | |
| parent | 2bfb3eb7d0323e69affca154395f51d8b577414d (diff) | |
Merge tag 'upstream/1.1.93'
Upstream version 1.1.93
Diffstat (limited to 'src/settings/nm-settings.c')
| -rw-r--r-- | src/settings/nm-settings.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 77e45f49..4ad395a1 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -104,16 +104,18 @@ EXPORT(nm_settings_connection_replace_and_commit) #define HOSTNAMED_SERVICE_PATH "/org/freedesktop/hostname1" #define HOSTNAMED_SERVICE_INTERFACE "org.freedesktop.hostname1" -#define HOSTNAME_FILE_DEFAULT "/etc/hostname" -#define HOSTNAME_FILE_SUSE "/etc/HOSTNAME" -#define HOSTNAME_FILE_GENTOO "/etc/conf.d/hostname" -#define IFCFG_DIR SYSCONFDIR "/sysconfig/network" -#define CONF_DHCP IFCFG_DIR "/dhcp" +#define HOSTNAME_FILE_DEFAULT "/etc/hostname" +#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 PLUGIN_MODULE_PATH "plugin-module-path" #if defined(HOSTNAME_PERSIST_SUSE) -#define HOSTNAME_FILE HOSTNAME_FILE_SUSE +#define HOSTNAME_FILE HOSTNAME_FILE_UCASE_HOSTNAME +#elif defined(HOSTNAME_PERSIST_SLACKWARE) +#define HOSTNAME_FILE HOSTNAME_FILE_UCASE_HOSTNAME #elif defined(HOSTNAME_PERSIST_GENTOO) #define HOSTNAME_FILE HOSTNAME_FILE_GENTOO #else |