diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:58 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:58 +0200 |
| commit | 50d10b224edf190c5b1f7e8d64140265d19c7bbb (patch) | |
| tree | 34628949c4cb1fdb4c7fc7395c8a9d0bf765875d /scripts | |
| parent | 8a11a59b379b641423a6ed655aae36ec00404403 (diff) | |
| parent | 95bd1a07a3f28bf9f5ad79219e83685e95d01605 (diff) | |
| download | barebox-50d10b224edf190c5b1f7e8d64140265d19c7bbb.tar.gz barebox-50d10b224edf190c5b1f7e8d64140265d19c7bbb.tar.xz | |
Merge branch 'for-next/env'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/bareboxenv.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/bareboxenv.c b/scripts/bareboxenv.c index da420db578..249e65b251 100644 --- a/scripts/bareboxenv.c +++ b/scripts/bareboxenv.c @@ -109,6 +109,7 @@ static void usage(char *prgname) "\n" "options:\n" " -s save (directory -> environment sector)\n" + " -z force the built-in default environment at startup\n" " -l load (environment sector -> directory)\n" " -p <size> pad output file to given size\n" " -v verbose\n", @@ -120,9 +121,10 @@ int main(int argc, char *argv[]) int opt; int save = 0, load = 0, pad = 0, err = 0, fd; char *filename = NULL, *dirname = NULL; + unsigned envfs_flags = 0; int verbose = 0; - while((opt = getopt(argc, argv, "slp:v")) != -1) { + while((opt = getopt(argc, argv, "slp:vz")) != -1) { switch (opt) { case 's': save = 1; @@ -133,6 +135,10 @@ int main(int argc, char *argv[]) case 'p': pad = strtoul(optarg, NULL, 0); break; + case 'z': + envfs_flags |= ENVFS_FLAGS_FORCE_BUILT_IN; + save = 1; + break; case 'v': verbose = 1; break; @@ -181,7 +187,7 @@ int main(int argc, char *argv[]) if (verbose) printf("saving contents of %s to file %s\n", dirname, filename); - err = envfs_save(filename, dirname); + err = envfs_save(filename, dirname, envfs_flags); if (verbose && err) printf("saving env failed: %d\n", err); |