Attachment 317821 Details for Bug 462083 – Patch to bring up NM early

[patch] Patch to bring up NM early

anaconda-11.4.1.40-nm.patch (text/plain), 3.46 KB, created by Orion Poplawski on 2008-09-26 18:06:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Orion Poplawski

Created: 2008-09-26 18:06:14 UTC

Size: 3.46 KB

patch

obsolete

>--- anaconda-11.4.1.40/loader/net.c.nm	2008-09-24 23:07:51.000000000 -0600
>+++ anaconda-11.4.1.40/loader/net.c	2008-09-26 11:45:32.000000000 -0600
>@@ -1725,6 +1725,7 @@
>  */
> int get_connection(iface_t *iface) {
>     int count = 0;
>+    int rc = 0;
>     DBusConnection *connection = NULL;
>     DBusMessage *message = NULL;
>     DBusMessage *reply = NULL;
>@@ -1733,6 +1734,7 @@
>     dbus_uint32_t state = 0;
>     char *nm_iface = "org.freedesktop.NetworkManager";
>     char *property = "State";
>+    char *error_str = NULL;
> 
>     if (iface == NULL) {
>         return 1;
>@@ -1754,7 +1756,7 @@
>     connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
>     if (connection == NULL) {
>         if (dbus_error_is_set(&error)) {
>-            logMessage(DEBUGLVL, "%s (%d): %s: %s", __func__,
>+            logMessage(INFO, "%s (%d): %s: %s", __func__,
>                        __LINE__, error.name, error.message);
>             dbus_error_free(&error);
>         }
>@@ -1762,6 +1764,12 @@
>         return 2;
>     }
> 
>+    rc = iface_start_NetworkManager(connection, &error_str);
>+    if (rc != 0) {
>+        logMessage(ERROR, "failed to start NetworkManager (%d): error %d (%s)",
>+                   __LINE__, rc, error_str ? error_str : "unknown");
>+    }
>+
>     dbus_error_init(&error);
>     message = dbus_message_new_method_call(NM_DBUS_SERVICE,
>                                            NM_DBUS_PATH,
>@@ -1769,7 +1777,7 @@
>                                            "Get");
>     if (!message) {
>         if (dbus_error_is_set(&error)) {
>-            logMessage(DEBUGLVL, "%s (%d): %s: %s", __func__,
>+            logMessage(ERROR, "%s (%d): %s: %s", __func__,
>                        __LINE__, error.name, error.message);
>             dbus_error_free(&error);
>         }
>@@ -1783,7 +1791,7 @@
>                                   DBUS_TYPE_STRING, &property,
>                                   DBUS_TYPE_INVALID)) {
>         if (dbus_error_is_set(&error)) {
>-            logMessage(DEBUGLVL, "%s (%d): %s: %s", __func__,
>+            logMessage(ERROR, "%s (%d): %s: %s", __func__,
>                        __LINE__, error.name, error.message);
>             dbus_error_free(&error);
>         }
>@@ -1800,7 +1808,7 @@
>                                                           &error);
>         if (!reply) {
>             if (dbus_error_is_set(&error)) {
>-                logMessage(DEBUGLVL, "%s (%d): %s: %s", __func__,
>+                logMessage(ERROR, "%s (%d): %s: %s", __func__,
>                            __LINE__, error.name, error.message);
>                 dbus_error_free(&error);
>             }
>@@ -1812,7 +1820,7 @@
>         /* extra uint32 'state' property from the returned variant type */
>         dbus_message_iter_init(reply, &iter);
>         if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) {
>-            logMessage(DEBUGLVL, "%s (%d): unexpected reply format",
>+            logMessage(ERROR, "%s (%d): unexpected reply format",
>                        __func__, __LINE__);
>             dbus_message_unref(message);
>             dbus_message_unref(reply);
>@@ -1822,7 +1830,7 @@
>         /* open the variant */
>         dbus_message_iter_recurse(&iter, &variant_iter);
>         if (dbus_message_iter_get_arg_type(&variant_iter) != DBUS_TYPE_UINT32) {
>-            logMessage(DEBUGLVL, "%s (%d): unexpected reply format",
>+            logMessage(ERROR, "%s (%d): unexpected reply format",
>                        __func__, __LINE__);
>             dbus_message_unref(message);
>             dbus_message_unref(reply);

Actions: View | Diff

Attachments on bug 462083: 317821