X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libfstools%2Fextroot.c;h=73ceae85f5d119f71392f9e70741eb352ae404e6;hb=4b68e9f9ea894bf58d31e26ca5ed92c81b1a115e;hp=45cc3f51bf27e6d36dfa8d8cf0b2121d6c1a1105;hpb=35056038c02a7cbd18b57a5f46a373d564c69693;p=project%2Ffstools.git diff --git a/libfstools/extroot.c b/libfstools/extroot.c index 45cc3f5..73ceae8 100644 --- a/libfstools/extroot.c +++ b/libfstools/extroot.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "libfstools.h" @@ -39,19 +40,35 @@ int mount_extroot(void) if (!extroot_prefix) return -1; - sprintf(ldlib_path, "%s/lib", extroot_prefix); - sprintf(block_path, "%s/sbin/block", extroot_prefix); + /* try finding the library directory */ + snprintf(ldlib_path, sizeof(ldlib_path), "%s/upper/lib", extroot_prefix); - if (stat(block_path, &s)) + if (stat(ldlib_path, &s) || !S_ISDIR(s.st_mode)) + snprintf(ldlib_path, sizeof(ldlib_path), "%s/lib", extroot_prefix); + + /* try finding the block executable */ + snprintf(block_path, sizeof(block_path), "%s/upper/sbin/block", extroot_prefix); + + if (stat(block_path, &s) || !S_ISREG(s.st_mode)) + snprintf(block_path, sizeof(block_path), "%s/sbin/block", extroot_prefix); + + if (stat(block_path, &s) || !S_ISREG(s.st_mode)) + snprintf(block_path, sizeof(block_path), "/sbin/block"); + + if (stat(block_path, &s) || !S_ISREG(s.st_mode)) return -1; - sprintf(kmod_loader, "/sbin/kmodloader %s/etc/modules-boot.d/ %s", extroot_prefix, extroot_prefix); - system(kmod_loader); + /* set LD_LIBRARY_PATH env var and load kmods from overlay if we found a lib directory there */ + if (!stat(ldlib_path, &s) && S_ISDIR(s.st_mode)) { + setenv("LD_LIBRARY_PATH", ldlib_path, 1); + snprintf(kmod_loader, sizeof(kmod_loader), + "/sbin/kmodloader %s/etc/modules-boot.d/", dirname(ldlib_path)); + system(kmod_loader); + } pid = fork(); if (!pid) { mkdir("/tmp/extroot", 0755); - setenv("LD_LIBRARY_PATH", ldlib_path, 1); execl(block_path, block_path, "extroot", NULL); exit(-1); } else if (pid > 0) {