mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-25 07:01:51 +02:00
dbf38e7683
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17152 3c298f89-4303-0410-b956-a3cf2f4a3e73
62 lines
2.4 KiB
Diff
62 lines
2.4 KiB
Diff
This patch adds a new configuration option (overlay_root) specifying
|
|
what mount point opkg should check for available storage space.
|
|
|
|
Signed-off-by: Nicolas Thill <nico@openwrt.org>
|
|
|
|
|
|
--- a/libopkg/opkg_conf.c
|
|
+++ b/libopkg/opkg_conf.c
|
|
@@ -70,6 +70,7 @@ int opkg_init_options_array(const opkg_c
|
|
{ "offline_root_path", OPKG_OPT_TYPE_STRING, &conf->offline_root_path },
|
|
{ "offline_root_post_script_cmd", OPKG_OPT_TYPE_STRING, &conf->offline_root_post_script_cmd },
|
|
{ "offline_root_pre_script_cmd", OPKG_OPT_TYPE_STRING, &conf->offline_root_pre_script_cmd },
|
|
+ { "overlay_root", OPKG_OPT_TYPE_STRING, &conf->overlay_root },
|
|
{ "proxy_passwd", OPKG_OPT_TYPE_STRING, &conf->proxy_passwd },
|
|
{ "proxy_user", OPKG_OPT_TYPE_STRING, &conf->proxy_user },
|
|
{ "query-all", OPKG_OPT_TYPE_BOOL, &conf->query_all },
|
|
--- a/libopkg/opkg_conf.h
|
|
+++ b/libopkg/opkg_conf.h
|
|
@@ -70,6 +70,7 @@ struct opkg_conf
|
|
char *offline_root_path;
|
|
char *offline_root_pre_script_cmd;
|
|
char *offline_root_post_script_cmd;
|
|
+ char *overlay_root;
|
|
int query_all;
|
|
int verbosity;
|
|
int noaction;
|
|
--- a/libopkg/opkg_install.c
|
|
+++ b/libopkg/opkg_install.c
|
|
@@ -474,12 +474,15 @@ static int verify_pkg_installable(opkg_c
|
|
* my diddling with the .opk file size below isn't going to cut it.
|
|
* 3) return a proper error code instead of 1
|
|
*/
|
|
- int comp_size, blocks_available;
|
|
+ int comp_size, blocks_available = -1;
|
|
char *root_dir;
|
|
|
|
if (!conf->force_space && pkg->installed_size != NULL) {
|
|
root_dir = pkg->dest ? pkg->dest->root_dir : conf->default_dest->root_dir;
|
|
- blocks_available = get_available_blocks(root_dir);
|
|
+ if (conf->overlay_root != NULL)
|
|
+ blocks_available = get_available_blocks(conf->overlay_root);
|
|
+ if (blocks_available < 0)
|
|
+ blocks_available = get_available_blocks(root_dir);
|
|
|
|
comp_size = strtoul(pkg->installed_size, NULL, 0);
|
|
/* round up a blocks count without doing fancy-but-slow casting jazz */
|
|
--- a/libopkg/opkg_utils.c
|
|
+++ b/libopkg/opkg_utils.c
|
|
@@ -30,10 +30,8 @@ long unsigned int get_available_blocks(c
|
|
{
|
|
struct statfs sfs;
|
|
|
|
- if(statfs(filesystem, &sfs)){
|
|
- fprintf(stderr, "bad statfs\n");
|
|
- return 0;
|
|
- }
|
|
+ if(statfs(filesystem, &sfs))
|
|
+ return -1;
|
|
/* fprintf(stderr, "reported fs type %x\n", sfs.f_type); */
|
|
|
|
// Actually ((sfs.f_bavail * sfs.f_bsize) / 1024)
|