diff options
| author | William Bryan <wilbryan@us.ibm.com> | 2015-02-17 11:37:55 -0600 |
|---|---|---|
| committer | Stephan Broyles <sbroyles@us.ibm.com> | 2015-02-17 14:41:02 -0600 |
| commit | e02a2568e568179d3d478e0a9475a4081e638de0 (patch) | |
| tree | 1eaa819845428e36aa2ad12be490682ee1672cab /src/occBootLoader | |
| parent | 9f4322e7283890fa595702e132a4fe48f373bc5b (diff) | |
| download | talos-occ-e02a2568e568179d3d478e0a9475a4081e638de0.tar.gz talos-occ-e02a2568e568179d3d478e0a9475a4081e638de0.zip | |
imageHdrScript improvements
Change-Id: Ic991f2efb1e4f51419262bc39d6f09c10faf1003
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15787
Reviewed-by: Stephan Broyles <sbroyles@us.ibm.com>
Tested-by: Stephan Broyles <sbroyles@us.ibm.com>
Diffstat (limited to 'src/occBootLoader')
| -rwxr-xr-x | src/occBootLoader/imageHdrScript.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/occBootLoader/imageHdrScript.c b/src/occBootLoader/imageHdrScript.c index 97b1fae..5cf5816 100755 --- a/src/occBootLoader/imageHdrScript.c +++ b/src/occBootLoader/imageHdrScript.c @@ -245,20 +245,20 @@ int combineImage(char * i_file1) do { - char * l_sbPath = getenv("SANDBOXBASE"); + char * l_sbPath = getenv("OCCROOT"); if( l_sbPath != NULL) { l_size = strlen(l_sbPath); - l_size += strlen(FILE_TO_WRITE_ODE); + l_size += strlen(FILE_TO_WRITE_GNU); + l_odeBuild = FALSE; } else { - l_sbPath = getenv("OCCROOT"); + l_sbPath = getenv("SANDBOXBASE"); if(l_sbPath != NULL) { l_size = strlen(l_sbPath); - l_size += strlen(FILE_TO_WRITE_GNU); - l_odeBuild = FALSE; + l_size += strlen(FILE_TO_WRITE_ODE); } else { @@ -279,7 +279,8 @@ int combineImage(char * i_file1) strncpy(&l_fileToWrite[strlen(l_sbPath)],FILE_TO_WRITE_GNU,strlen(FILE_TO_WRITE_GNU)); } l_fileToWrite[l_size] = '\0'; - printf("l_fileToWrite: %s\t\tl_sbPath: %s\n", l_fileToWrite, l_sbPath); + printf("Writing to file: %s\n", l_fileToWrite); + // Open the file1 l_file1 = fopen(i_file1, "r"); |
