summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-03-23 17:00:37 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-03-23 17:00:37 -0700
commit93774a428cc02972fef98280eef29fc582c4e4db (patch)
tree5c6d2939c02a2dbde66fa148ed36bef4f011eb3a
parent88576a9df64114e9c2dee6fb10b82f6c21db2d11 (diff)
parent0286665a18145c539e72153ff1df9b9c6b31656d (diff)
downloadvyatta-cfg-93774a428cc02972fef98280eef29fc582c4e4db.tar.gz
vyatta-cfg-93774a428cc02972fef98280eef29fc582c4e4db.zip
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg into jenner
-rw-r--r--src/common/unionfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/unionfs.c b/src/common/unionfs.c
index 5e90c0c..840dc68 100644
--- a/src/common/unionfs.c
+++ b/src/common/unionfs.c
@@ -769,7 +769,7 @@ apply_priority(GNode *root_node)
char str[1025];
while (fgets(str, 1024, fp) != 0) {
gchar** tok_str = g_strsplit(str," ",3);
- if (tok_str[0] == NULL || tok_str[1] == NULL) {
+ if (tok_str[0] == NULL || tok_str[1] == NULL || strncmp(tok_str[0],"#",1) == 0) {
continue;
}
char *path = tok_str[1];