diff options
author | Thomas Chou <thomas@wytron.com.tw> | 2010-12-31 09:45:19 +0800 |
---|---|---|
committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2011-01-16 20:50:47 +0200 |
commit | 70f86090720d7b5b8203ee43356f8c6f79219896 (patch) | |
tree | 51552b1b2bdd2c5f28398d9ce66e43216234a05c | |
parent | 4d91ded71d78c5c651482f0e4ae082b73edba0c1 (diff) |
mkfs.jffs2: fix repeated dev nodesv1.4.2
Fix the repeated nodes with the same primary name in device_table.txt.
They were not generated correctly.
/dev/tty c 666 0 0 5 0 0 0 -
/dev/tty c 666 0 0 4 0 0 1 6
# IDE Devices
/dev/hda b 640 0 0 3 0 0 0 -
/dev/hda b 640 0 0 3 1 1 1 15
/dev/hdb b 640 0 0 3 64 0 0 -
/dev/hdb b 640 0 0 3 65 1 1 15
Only created,
/dev/tty
/dev/hda
/dev/hdb
Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r-- | mkfs.jffs2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkfs.jffs2.c b/mkfs.jffs2.c index 167af1f..3aab533 100644 --- a/mkfs.jffs2.c +++ b/mkfs.jffs2.c @@ -457,7 +457,7 @@ static int interpret_table_entry(struct filesystem_entry *root, char *line) errmsg_die("Unsupported file type '%c'", type); } entry = find_filesystem_entry(root, name, mode); - if (entry) { + if (entry && !(count > 0 && (type == 'c' || type == 'b'))) { /* Ok, we just need to fixup the existing entry * and we will be all done... */ entry->sb.st_uid = uid; |