Index: NetworkManager-0.7.0/system-settings/plugins/ifcfg-rh/reader.c
===================================================================
--- NetworkManager-0.7.0/system-settings/plugins/ifcfg-rh/reader.c	(revision 4306)
+++ NetworkManager-0.7.0/system-settings/plugins/ifcfg-rh/reader.c	(working copy)
@@ -123,9 +123,15 @@ make_connection_setting (const char *fil
 	              NULL);
 	g_free (uuid);
 
-	/* Be somewhat conservative about autoconnect */
-	if (svTrueValue (ifcfg, "ONBOOT", FALSE))
-		g_object_set (s_con, NM_SETTING_CONNECTION_AUTOCONNECT, TRUE, NULL);
+	/* To preserve compatibility with RHEL 5.2, ignore ONBOOT unless the
+	 * special flag NM_HONOR_ONBOOT is TRUE.
+	 */
+	if (svTrueValue (ifcfg, "NM_HONOR_ONBOOT", FALSE)) {
+		/* Be somewhat conservative about autoconnect */
+		if (svTrueValue (ifcfg, "ONBOOT", FALSE))
+			g_object_set (s_con, NM_SETTING_CONNECTION_AUTOCONNECT, TRUE, NULL);
+	} else
+		g_object_set (s_con, NM_SETTING_CONNECTION_AUTOCONNECT, TRUE, NULL);
 
 	g_free (ifcfg_name);
 	return NM_SETTING (s_con);