1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
Index: network-manager/system-settings/plugins/ifupdown/interface_parser.c
===================================================================
--- network-manager.orig/system-settings/plugins/ifupdown/interface_parser.c 2011-03-11 14:38:52.996832466 +0100
+++ network-manager/system-settings/plugins/ifupdown/interface_parser.c 2011-03-11 14:47:12.580832465 +0100
@@ -51,6 +51,7 @@
void add_data(const char *key,const char *data)
{
if_data *ret;
+ char *idx;
// Check if there is a block where we can attach our data
if (first == NULL)
@@ -58,6 +59,11 @@
ret = (if_data*) calloc(1,sizeof(struct _if_data));
ret->key = g_strdup(key);
+ // Normalize keys. Convert '_' to '-', as ifupdown accepts both variants.
+ // When querying keys via ifparser_getkey(), use '-'.
+ while ((idx = strrchr(ret->key, '_'))) {
+ *idx = '-';
+ }
ret->data = g_strdup(data);
if (last->info == NULL)
Index: network-manager/system-settings/plugins/ifupdown/plugin.c
===================================================================
--- network-manager.orig/system-settings/plugins/ifupdown/plugin.c 2011-03-11 14:47:01.272832466 +0100
+++ network-manager/system-settings/plugins/ifupdown/plugin.c 2011-03-11 14:47:12.580832465 +0100
@@ -366,7 +366,7 @@
/* Bridge configuration */
if(!strncmp ("br", block->name, 2)) {
/* Try to find bridge ports */
- const char *ports = ifparser_getkey (block, "bridge_ports");
+ const char *ports = ifparser_getkey (block, "bridge-ports");
if (ports) {
int i;
int state = 0;
|
