block: support builtin fstab config

Fall back to /etc/config/fstab if the file on the overlay cannot be loaded.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

diff --git a/block.c b/block.c
index c29017d13794e77fc5483cd621318ce4776ab590..de8a3b7306156c570d1fa85799e66d3f74ab7a6b 100644 (file)
--- a/block.c
+++ b/block.c
@@ -410,14 +410,16 @@ static int config_load(char *cfg)
                uci_set_confdir(ctx, path);
        }
 
-       if (uci_load(ctx, "fstab", &pkg))
-       {
-               char *err;
-               uci_get_errorstr(ctx, &err, "fstab");
-               ERROR("extroot: failed to load %s/etc/config/%s\n",
-                     cfg ? cfg : "", err);
-               free(err);
-               return -1;
+       if (uci_load(ctx, "fstab", &pkg)) {
+               uci_set_confdir(ctx, "/etc/config");
+               if (uci_load(ctx, "fstab", &pkg)) {
+                       char *err;
+                       uci_get_errorstr(ctx, &err, "fstab");
+                       ERROR("extroot: failed to load %s/etc/config/%s\n",
+                             cfg ? cfg : "", err);
+                       free(err);
+                       return -1;
+               }
        }
 
        vlist_update(&mounts);