diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2011-02-22 16:33:45 -0800 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2011-02-22 16:33:45 -0800 |
| commit | 95b4b15c8b0d47a7323cd74858714023c7a22a22 (patch) | |
| tree | 53d6ed54ecfdc38ffedcf910c8e22ac0a7758e88 /src/common | |
| parent | 0c45579ce0c5672677c8fb9f9ea82d404c0e01a2 (diff) | |
| download | vyatta-cfg-95b4b15c8b0d47a7323cd74858714023c7a22a22.tar.gz vyatta-cfg-95b4b15c8b0d47a7323cd74858714023c7a22a22.zip | |
clean up dead code etc. etc. etc.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/unionfs.c | 10 | ||||
| -rw-r--r-- | src/common/unionfs.h | 16 |
2 files changed, 3 insertions, 23 deletions
diff --git a/src/common/unionfs.c b/src/common/unionfs.c index f33d3c3..0c95cab 100644 --- a/src/common/unionfs.c +++ b/src/common/unionfs.c @@ -378,13 +378,13 @@ retrieve_data(char* rel_data_path, GNode *node, const char* root, } if (strcmp(dirp->d_name, ".") != 0 && strcmp(dirp->d_name, "..") != 0 && - strcmp(dirp->d_name, MODIFIED_FILE) != 0 && + strcmp(dirp->d_name, MOD_NAME) != 0 && strcmp(dirp->d_name, UNSAVED_FILE) != 0 && strcmp(dirp->d_name, DEF_FILE) != 0 && strcmp(dirp->d_name, DISABLE_FILE) != 0 && strcmp(dirp->d_name, WHITEOUT_FILE) != 0 && strcmp(dirp->d_name, WHITEOUT_DISABLE_FILE) != 0 && - strcmp(dirp->d_name, VALUE_FILE) != 0) { + strcmp(dirp->d_name, VAL_NAME) != 0) { processed = TRUE; NODE_ACTIVATE deactivated = K_NO_DISABLE_OP; @@ -601,7 +601,7 @@ boolean value_exists(char *path) { char buf[MAX_LENGTH_DIR_PATH]; - sprintf(buf, "%s/%s",path,VALUE_FILE); + sprintf(buf, "%s/%s",path,VAL_NAME); struct stat stat_buf; return !stat(buf,&stat_buf); } @@ -781,8 +781,6 @@ common_commit_copy_to_live_config(GNode *node, boolean suppress_piecewise_copy, static const char format1point1[]="mv -f %s/* -t %s"; /*mdirp, tmpp*/ static const char format1point5[]="rm -fr '%s'/*"; /*tmpp*/ - set_echo(TRUE); - char mbuf[MAX_LENGTH_DIR_PATH]; sprintf(mbuf,"%s%s",get_mdirp(),path); char cbuf[MAX_LENGTH_DIR_PATH]; @@ -910,8 +908,6 @@ common_commit_clean_temp_config(GNode *root_node, boolean test_mode) char abuf[MAX_LENGTH_DIR_PATH]; sprintf(abuf,"%s",get_adirp()); - set_echo(TRUE); - if (test_mode == FALSE) { sys_umount_session(); } diff --git a/src/common/unionfs.h b/src/common/unionfs.h index 362972e..0682b69 100644 --- a/src/common/unionfs.h +++ b/src/common/unionfs.h @@ -7,22 +7,6 @@ #include "../cli_val.h" #include "../cli_objects.h" -/* names of VYATTA env vars */ -#define ENV_EDIT_LEVEL "VYATTA_EDIT_LEVEL" -#define ENV_TEMPLATE_LEVEL "VYATTA_TEMPLATE_LEVEL" -#define ENV_A_DIR "VYATTA_ACTIVE_CONFIGURATION_DIR" -#define ENV_C_DIR "VYATTA_CHANGES_ONLY_DIR" -#define ENV_M_DIR "VYATTA_TEMP_CONFIG_DIR" -#define ENV_T_DIR "VYATTA_CONFIG_TEMPLATE" -#define ENV_TMP_DIR "VYATTA_CONFIG_TMP" -#define DEF_A_DIR "/opt/vyatta/config/active" -#define DEF_T_DIR "/opt/vyatta/share/ofr/template" -#define ENV_OLD_PS1 "VYATTA_OLD_PS1" -#define NODE_PRIORITY_FILE "/opt/vyatta/share/vyatta-cfg/priority" - -#define NODE_TAG_FILE "node.tag" -#define VALUE_FILE "node.val" -#define MODIFIED_FILE ".modified" #define UNSAVED_FILE ".unsaved" #define DISABLE_FILE ".disable" #define DEF_FILE "def" |