[PATCH] ubi-utils: Fixup pddcustomize
Frank Haverkamp
haver at vnet.ibm.com
Fri Feb 22 03:47:35 EST 2008
Subject: ubi-utils: pddcustomize fixup update volume
From: Frank Haverkamp <haver at vnet.ibm.com>
Somehow calling ubi_update_start was forgotten and caused the
tool not to write but silently ignore the write.
Signed-off-by: Frank Haverkamp <haver at vnet.ibm.com>
---
ubi-utils/src/bootenv.c | 2 +-
ubi-utils/src/pddcustomize.c | 16 ++++++++++++----
2 files changed, 13 insertions(+), 5 deletions(-)
--- mtd-utils.git.orig/ubi-utils/src/bootenv.c
+++ mtd-utils.git/ubi-utils/src/bootenv.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) International Business Machines Corp., 2006
+ * Copyright (c) International Business Machines Corp., 2008
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
--- mtd-utils.git.orig/ubi-utils/src/pddcustomize.c
+++ mtd-utils.git/ubi-utils/src/pddcustomize.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) International Business Machines Corp., 2006
+ * Copyright (c) International Business Machines Corp., 2008
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@
#include "libubi.h"
#include "ubimirror.h"
-#define PROGRAM_VERSION "1.5"
+#define PROGRAM_VERSION "1.6"
#define DEFAULT_DEV_PATTERN "/dev/ubi%d"
#define DEFAULT_VOL_PATTERN "/dev/ubi%d_%d"
@@ -369,7 +369,7 @@ ubi_write_bootenv(uint32_t devno, uint32
int rc = 0;
char path[PATH_MAX];
FILE* fp_out = NULL;
- size_t nbytes ;
+ size_t nbytes;
rc = bootenv_size(env, &nbytes);
if (rc) {
@@ -387,6 +387,13 @@ ubi_write_bootenv(uint32_t devno, uint32
fp_out = fopen(path, "r+");
if (fp_out == NULL) {
err_msg("Cannot fopen volume:%d number:%d\n", devno, id);
+ rc = -EBADF;
+ goto err;
+ }
+
+ rc = ubi_update_start(ulib, fileno(fp_out), nbytes);
+ if (rc != 0) {
+ err_msg("Cannot start update for %s\n", path);
goto err;
}
@@ -396,7 +403,6 @@ ubi_write_bootenv(uint32_t devno, uint32
devno, id);
goto err;
}
-
err:
if( fp_out )
fclose(fp_out);
@@ -495,6 +501,8 @@ main(int argc, char **argv) {
rc = write_bootenv(args.file_in, env);
else
rc = ubi_write_bootenv(EXAMPLE_UBI_DEVICE, boot_volno, env);
+
+ printf("rc=%d\n", rc);
if (rc != 0) {
goto err;
}
--
IBM Deutschland Entwicklung GmbH, Schoenaicher Str. 220, 71032
Boeblingen, Vorsitzender des Aufsichtsrats: Martin Jetter
Geschäftsführung: Herbert Kircher, Sitz der Gesellschaft: Böblingen,
Registergericht: Amtsgericht Stuttgart, HRB 243294
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 001-ubi-utils-fixup-pddcustomize.patch
Type: text/x-patch
Size: 2685 bytes
Desc: not available
Url : http://lists.infradead.org/pipermail/linux-mtd/attachments/20080222/a58a57f9/attachment-0002.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 5269 bytes
Desc: not available
Url : http://lists.infradead.org/pipermail/linux-mtd/attachments/20080222/a58a57f9/attachment-0003.bin
More information about the linux-mtd
mailing list