From 06215f2bd982e9edc9c633dc0f0b80d8ee0aa581 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 2 Nov 2011 08:53:27 +0100
Subject: rename_device: skip VLAN=yes configuration files

---
 src/rename_device.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/rename_device.c b/src/rename_device.c
index 3cd25e1e..f96291b0 100644
--- a/src/rename_device.c
+++ b/src/rename_device.c
@@ -147,11 +147,13 @@ struct netdev *get_configs() {
 	for (x = 0; x < ncfgs; x++ ) {
 		char *path;
 		char *devname, *hwaddr;
+		int vlan;
 		gchar *contents, **lines;
 		int i;
 		
 		devname = hwaddr = contents = NULL;
 		lines = NULL;
+		vlan = 0;
 		if (asprintf(&path,"/etc/sysconfig/network-scripts/%s",
 			     cfgs[x]->d_name) == -1)
 			continue;
@@ -175,8 +177,11 @@ struct netdev *get_configs() {
 				hwaddr = dequote(lines[i] + 7, NULL);
 			}
 #endif
+			if (g_str_has_prefix(lines[i],"VLAN=yes")) {
+				vlan=1;
+			}
 		}
-		if (!devname || !hwaddr) {
+		if (!devname || !hwaddr || vlan) {
 			g_free(contents);
 			g_strfreev(lines);
 			continue;
-- 
cgit v1.2.1