From 5491f0c36e60f6128a9d63f4db2f27e44ff8e7bd Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 26 May 2010 00:34:12 -0700
Subject: [PATCH] keyfile: add required PPP setting for serial-based
 connections

---
 system-settings/plugins/keyfile/io/reader.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/system-settings/plugins/keyfile/io/reader.c b/system-settings/plugins/keyfile/io/reader.c
index e8d4024faa..011e86042c 100644
--- a/system-settings/plugins/keyfile/io/reader.c
+++ b/system-settings/plugins/keyfile/io/reader.c
@@ -33,6 +33,8 @@
 #include <nm-setting-wired.h>
 #include <nm-setting-wireless.h>
 #include <nm-setting-bluetooth.h>
+#include <nm-setting-serial.h>
+#include <nm-setting-ppp.h>
 #include <arpa/inet.h>
 #include <netinet/ether.h>
 #include <string.h>
@@ -1035,6 +1037,12 @@ connection_from_file (const char *filename)
 			}
 		}
 
+		/* Serial connections require a PPP setting too */
+		if (nm_connection_get_setting (connection, NM_TYPE_SETTING_SERIAL)) {
+			if (!nm_connection_get_setting (connection, NM_TYPE_SETTING_PPP))
+				nm_connection_add_setting (connection, nm_setting_ppp_new ());
+		}
+
 		/* Handle vpn secrets after the 'vpn' setting was read */
 		if (vpn_secrets) {
 			NMSettingVPN *s_vpn;