skip ubi volume detection if ubifs is not present (fall back to mtd in that case)
authorFelix Fietkau <nbd@openwrt.org>
Mon, 19 May 2014 21:02:56 +0000 (23:02 +0200)
committerFelix Fietkau <nbd@openwrt.org>
Mon, 19 May 2014 21:02:56 +0000 (23:02 +0200)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
libfstools/ubi.c

index a281729f4a541ad6358265d63c219045d116340e..42f76ca7a29a794cc9a2d968095f41c6b3e0f74b 100644 (file)
@@ -180,6 +180,9 @@ static int ubi_volume_find(struct volume *v, char *name)
        unsigned int ubi_num;
        int ret = -1;
 
        unsigned int ubi_num;
        int ret = -1;
 
+       if (find_filesystem("ubifs"))
+               return ret;
+
        ubi_dir = opendir(ubi_dir_name);
        /* check for os ubi support */
        if (!ubi_dir)
        ubi_dir = opendir(ubi_dir_name);
        /* check for os ubi support */
        if (!ubi_dir)