Add support for sysfs mocking

In order to use test files, allow sysfs root
to be set during compile time

Signed-off-by: Daniel Walter <dwalter@sigma-star.at>

diff --git a/lib/libmtd.c b/lib/libmtd.c
index 8c0157e176c4b4053d9c7bfb3279df38cd37deab..8bc532fc2f7df667410da1e695ae741490516a88 100644 (file)
--- a/lib/libmtd.c
+++ b/lib/libmtd.c
@@ -561,7 +561,7 @@ libmtd_t libmtd_open(void)
 
        lib->offs64_ioctls = OFFS64_IOCTLS_UNKNOWN;
 
-       lib->sysfs_mtd = mkpath("/sys", SYSFS_MTD);
+       lib->sysfs_mtd = mkpath(SYSFS_ROOT, SYSFS_MTD);
        if (!lib->sysfs_mtd)
                goto out_error;
 

diff --git a/lib/libmtd_int.h b/lib/libmtd_int.h
index 8ff33ad6864a83b54335fdcbf0ea24fab809e894..db2f1cf9f920c3148b1ac6c7edc8b3aa3f7f6bf3 100644 (file)
--- a/lib/libmtd_int.h
+++ b/lib/libmtd_int.h
@@ -30,6 +30,10 @@ extern "C" {
 
 #define PROGRAM_NAME "libmtd"
 
+#ifndef SYSFS_ROOT
+#define SYSFS_ROOT "/sys"
+#endif
+
 #define SYSFS_MTD        "class/mtd"
 #define MTD_NAME_PATT    "mtd%d"
 #define MTD_DEV          "dev"

diff --git a/ubi-utils/libubi.c b/ubi-utils/libubi.c
index 97c04345889aa2ba23ff1d1dc66c74633ad73260..758d3514eb255206a7da81f44651836514dface9 100644 (file)
--- a/ubi-utils/libubi.c
+++ b/ubi-utils/libubi.c
@@ -524,7 +524,7 @@ libubi_t libubi_open(void)
        if (!lib)
                return NULL;
 
-       lib->sysfs_ctrl = mkpath("/sys", SYSFS_CTRL);
+       lib->sysfs_ctrl = mkpath(SYSFS_ROOT, SYSFS_CTRL);
        if (!lib->sysfs_ctrl)
                goto out_error;
 
@@ -532,7 +532,7 @@ libubi_t libubi_open(void)
        if (!lib->ctrl_dev)
                goto out_error;
 
-       lib->sysfs_ubi = mkpath("/sys", SYSFS_UBI);
+       lib->sysfs_ubi = mkpath(SYSFS_ROOT, SYSFS_UBI);
        if (!lib->sysfs_ubi)
                goto out_error;
 

diff --git a/ubi-utils/libubi_int.h b/ubi-utils/libubi_int.h
index c3aa37a8f66c797b91a41c71fc217cc9a5965f2a..86ce18a31190aca9866accce1ebd7ce6fed9c903 100644 (file)
--- a/ubi-utils/libubi_int.h
+++ b/ubi-utils/libubi_int.h
@@ -36,6 +36,9 @@ extern "C" {
  * directories to '/sys/class/ubi/'. For now libubi assumes old layout.
  */
 
+#ifndef SYSFS_ROOT
+#define SYSFS_ROOT       "/sys"
+#endif
 #define SYSFS_UBI         "class/ubi"
 #define SYSFS_CTRL        "class/misc/ubi_ctrl/"