X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fopkg_install.c;h=74a2ce115a62e8496baaa2d3af1c3e57890f1705;hp=783887509fad84d7b92786fb1f87e9f475ce19f5;hb=0f54da55b8717543b08596e58c022ae49e70a184;hpb=2e7f79df655f82bf42ed2a06fea1a036d3d37024 diff --git a/libopkg/opkg_install.c b/libopkg/opkg_install.c index 7838875..74a2ce1 100644 --- a/libopkg/opkg_install.c +++ b/libopkg/opkg_install.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "pkg.h" #include "pkg_hash.h" @@ -192,13 +193,24 @@ static int verify_pkg_installable(pkg_t *pkg) { unsigned long kbs_available, pkg_size_kbs; - char *root_dir; + char *root_dir = NULL; + struct stat s; if (conf->force_space || pkg->installed_size == 0) return 0; - root_dir = pkg->dest ? pkg->dest->root_dir : - conf->default_dest->root_dir; + if (pkg->dest) + { + if (!strcmp(pkg->dest->name, "root") && conf->overlay_root + && !stat(conf->overlay_root, &s) && (s.st_mode & S_IFDIR)) + root_dir = conf->overlay_root; + else + root_dir = pkg->dest->root_dir; + } + + if (!root_dir) + root_dir = conf->default_dest->root_dir; + kbs_available = get_available_kbytes(root_dir); pkg_size_kbs = (pkg->installed_size + 1023)/1024;