settings: add persistent hostname support for Slackware

diff --git a/configure.ac b/configure.ac
index 578b077..131c5d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -350,21 +350,25 @@ PKG_CHECK_MODULES(SYSTEMD_200, [systemd >= 200], [have_systemd_200=yes],[have_sy
 AM_CONDITIONAL(HAVE_SYSTEMD_200, test "${have_systemd_200}" = "yes")
 
 # Hostname persist mode
-AC_ARG_WITH(hostname-persist, AS_HELP_STRING([--with-hostname-persist=default|suse|gentoo],
+AC_ARG_WITH(hostname-persist, AS_HELP_STRING([--with-hostname-persist=default|suse|gentoo|slackware],
        [Hostname persist method]))
 
 AS_IF([test "$with_hostname_persist" = "suse"], hostname_persist=suse)
 AS_IF([test "$with_hostname_persist" = "gentoo"], hostname_persist=gentoo)
+AS_IF([test "$with_hostname_persist" = "slackware"], hostname_persist=slackware)
 AS_IF([test "$with_hostname_persist" = "default"], hostname_persist=default)
 # if the method was not explicitly set, try to guess it from the enabled plugins
 AS_IF([test -z "$hostname_persist" -a "$distro_plugins" = "ifcfg-suse"], hostname_persist=suse)
 AS_IF([test -z "$hostname_persist" -a "$distro_plugins" = "ifnet"], hostname_persist=gentoo)
+AS_IF([test -z "$hostname_persist" -a -f /etc/slackware-version], hostname_persist=slackware)
 AS_IF([test -z "$hostname_persist"], hostname_persist=default)
 
 if test "$hostname_persist" = suse; then
        AC_DEFINE(HOSTNAME_PERSIST_SUSE, 1, [Enable SuSE hostname persist method])
 elif test "$hostname_persist" = gentoo; then
        AC_DEFINE(HOSTNAME_PERSIST_GENTOO, 1, [Enable Gentoo hostname persist method])
+elif test "$hostname_persist" = slackware; then
+       AC_DEFINE(HOSTNAME_PERSIST_SLACKWARE, 1, [Enable Slackware hostname persist method])
 fi
 
 AC_ARG_WITH(systemd-journal, AS_HELP_STRING([--with-systemd-journal=yes|no], [Use systemd journal for logging]))

diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index 77e45f4..4ad395a 100644 (file)
--- 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