sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

environment: allow saving of symbolic link changes 

Currently it is not possible to change symbolic links in the default
environment. For example if the default environment contains the
link "current_boot -> mmc" then the following does not work:

$ rm current_boot
$ ln net current_boot
$ saveenv

After reset the link is still pointing to "mmc" and this error appears:

"symlink: /env/boot/current_boot -> net : error -17"

The patch fixes the above problem and moves the "ENV_FLAG_NO_OVERWRITE"
to enable handling of symbolic links in this case too.

Signed-off-by: Zahari Doychev <zahari.doychev@linux.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Zahari Doychev 2015-12-16 13:24:43 +01:00 committed by Sascha Hauer
parent a9e7e68279
commit 295a5f8e4b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/environment.c
View File

@ -23,7 +23,6 @@
* the default environment when building the barebox binary. So
* do not add any new barebox related functions here!
*/
#ifdef __BAREBOX__
#include <common.h>
#include <command.h>
@ -417,6 +416,7 @@ static int envfs_load_data(struct envfs_super *super, void *buf, size_t size,
int headerlen_full;
/* for envfs < 1.0 */
struct envfs_inode_end inode_end_dummy;
struct stat s;
inode_end_dummy.mode = ENVFS_32(S_IRWXU | S_IRWXG | S_IRWXO);
inode_end_dummy.magic = ENVFS_32(ENVFS_INODE_END_MAGIC);
@ -460,11 +460,20 @@ static int envfs_load_data(struct envfs_super *super, void *buf, size_t size,
make_directory(dirname(tmp));
free(tmp);
ret = stat(str, &s);
if (!ret && (flags & ENV_FLAG_NO_OVERWRITE)) {
printf("skip %s\n", str);
goto skip;
}
if (S_ISLNK(ENVFS_32(inode_end->mode))) {
debug("symlink: %s -> %s\n", str, (char*)buf);
if (!strcmp(buf, basename(str))) {
unlink(str);
} else {
if (!ret)
unlink(str);
ret = symlink(buf, str);
if (ret < 0)
printf("symlink: %s -> %s : %s\n",
@ -472,14 +481,6 @@ static int envfs_load_data(struct envfs_super *super, void *buf, size_t size,
}
free(str);
} else {
struct stat s;
if (flags & ENV_FLAG_NO_OVERWRITE &&
!stat(str, &s)) {
printf("skip %s\n", str);
goto skip;
}
fd = open(str, O_WRONLY | O_CREAT | O_TRUNC, 0644);
free(str);
if (fd < 0) {