File nm-opensuse-merge.patch of Package NetworkManager

Overview Repositories Revisions Requests Users Attributes Meta

File nm-opensuse-merge.patch of Package NetworkManager (Revision 89e4a2f74eeab03fa22a46abd06173f1)

Currently displaying revision 89e4a2f74eeab03fa22a46abd06173f1 , Show latest

From 18de9cfebc2b892e67e95244c1e9af74fed24337 Mon Sep 17 00:00:00 2001
From: Tambet Ingo <tambet@gmail.com>
Date: Fri, 26 Sep 2008 11:32:56 +0300
Subject: [PATCH] Implement a utility script to merge opensuse's sysconfig configuration.

Index: NetworkManager-0.7.0/test/Makefile.am
===================================================================
--- NetworkManager-0.7.0.orig/test/Makefile.am
+++ NetworkManager-0.7.0/test/Makefile.am
@@ -31,3 +31,8 @@ libnm_glib_test_LDADD =	$(DBUS_LIBS) $(G
 			$(top_builddir)/libnm-glib/libnm_glib.la \
 			$(top_builddir)/libnm-util/libnm-util.la
 
+if TARGET_SUSE
+noinst_PROGRAMS += nm-opensuse-sysconfig-merge
+nm_opensuse_sysconfig_merge_SOURCES = nm-opensuse-sysconfig-merge.c
+nm_opensuse_sysconfig_merge_LDADD = $(GLIB_LIBS)
+endif
Index: NetworkManager-0.7.0/test/nm-opensuse-sysconfig-merge.c
===================================================================
--- /dev/null
+++ NetworkManager-0.7.0/test/nm-opensuse-sysconfig-merge.c
@@ -0,0 +1,117 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+#include <string.h>
+#include <glib.h>
+
+#define SYSCONFDIR "/etc"
+#define CONF_FILE SYSCONFDIR "/NetworkManager/nm-system-settings.conf"
+#define CONF_DHCP SYSCONFDIR "/sysconfig/network/dhcp"
+
+/* hostname */
+
+#define HOSTNAME_FILE SYSCONFDIR "/HOSTNAME"
+
+static gboolean
+hostname_is_dynamic (void)
+{
+    GIOChannel *channel;
+    const char *pattern = "DHCLIENT_SET_HOSTNAME=";
+    char *str = NULL;
+    int pattern_len;
+    gboolean dynamic = FALSE;
+
+    channel = g_io_channel_new_file (CONF_DHCP, "r", NULL);
+    if (!channel)
+        return dynamic;
+
+    pattern_len = strlen (pattern);
+
+    while (g_io_channel_read_line (channel, &str, NULL, NULL, NULL) != G_IO_STATUS_EOF) {
+        if (!strncmp (str, pattern, pattern_len)) {
+            if (!strncmp (str + pattern_len, "\"yes\"", 5))
+                dynamic = TRUE;
+            break;
+        }
+        g_free (str);
+    }
+
+    g_io_channel_shutdown (channel, FALSE, NULL);
+    g_io_channel_unref (channel);
+
+    return dynamic;
+}
+
+static char *
+hostname_read ()
+{
+    GIOChannel *channel;
+    char *hostname = NULL;
+
+    channel = g_io_channel_new_file (HOSTNAME_FILE, "r", NULL);
+    if (channel) {
+        g_io_channel_read_line (channel, &hostname, NULL, NULL, NULL);
+        g_io_channel_shutdown (channel, FALSE, NULL);
+        g_io_channel_unref (channel);
+
+        if (hostname) {
+            char *end_of_hostname;
+
+            end_of_hostname = strstr (hostname, ".");
+            if (end_of_hostname)
+                *end_of_hostname = '\0';
+            else
+                hostname = g_strchomp (hostname);
+        }
+    }
+
+    return hostname;
+}
+
+static void
+hostname_merge (GKeyFile *keyfile)
+{
+    gboolean merged;
+
+    merged = g_key_file_get_boolean (keyfile, "suse", "hostname-merged", NULL);
+    if (merged)
+        return;
+
+    if (!hostname_is_dynamic ()) {
+        char *hostname;
+
+        hostname = hostname_read ();
+        if (hostname) {
+            g_key_file_set_string (keyfile, "keyfile", "hostname", hostname);
+            g_free (hostname);
+        }
+    }
+
+    g_key_file_set_boolean (keyfile, "suse", "hostname-merged", TRUE);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+    GKeyFile *key_file;
+
+	key_file = g_key_file_new ();
+	if (g_key_file_load_from_file (key_file, CONF_FILE, G_KEY_FILE_NONE, NULL)) {
+        char *data;
+        gsize len;
+
+        /* Merge stuff */
+        hostname_merge (key_file);
+
+        /* Write keyfile back to disk */
+        data = g_key_file_to_data (key_file, &len, NULL);
+        if (data) {
+            g_file_set_contents (CONF_FILE, data, len, NULL);
+            g_free (data);
+        }
+    }
+
+	g_key_file_free (key_file);
+
+    return 0;
+}

Places

File nm-opensuse-merge.patch of Package NetworkManager (Revision 89e4a2f74eeab03fa22a46abd06173f1)

Places