summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorslioch <slioch@eng-140.vyatta.com>2009-10-21 16:33:13 -0700
committerslioch <slioch@eng-140.vyatta.com>2009-10-21 16:33:13 -0700
commit7c64f480f3aaa2f6d46bf3d83c62e084e9a3154e (patch)
tree1e57f479bf88a20f12c3afe39b4092f454d37bd1
parentb2b20a22373f96699484d7615fa50bb7eec801f2 (diff)
downloadvyatta-cfg-7c64f480f3aaa2f6d46bf3d83c62e084e9a3154e.tar.gz
vyatta-cfg-7c64f480f3aaa2f6d46bf3d83c62e084e9a3154e.zip
pull priority from file into data structure
-rw-r--r--src/common/defs.h1
-rw-r--r--src/common/unionfs.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/common/defs.h b/src/common/defs.h
index 50d2337..5fee3ca 100644
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -54,6 +54,7 @@ remove _actions and rely on def in the future.
struct Config
{
boolean _multi;
+ unsigned long _priority;
vtw_def _def; //keep this here
char* _help;
char* _default;
diff --git a/src/common/unionfs.c b/src/common/unionfs.c
index 35be6ec..3f845df 100644
--- a/src/common/unionfs.c
+++ b/src/common/unionfs.c
@@ -231,6 +231,7 @@ retrieve_data(char* rel_data_path, GNode *node, char* root, NODE_OPERATION op)
}
//either multi or tag--shouldn't have made a difference, but arkady was confused.
vn->_config._multi = (def.tag | def.multi);
+ vn->_priority = def.def_priority;
}
}