mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 21:23:21 +02:00
986ed8c893
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23174 3c298f89-4303-0410-b956-a3cf2f4a3e73
65 lines
1.9 KiB
Diff
65 lines
1.9 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
|
|
@@ -63,6 +63,7 @@ opkg_option_t options[] = {
|
|
{ "download_only", OPKG_OPT_TYPE_BOOL, &_conf.download_only },
|
|
{ "nodeps", OPKG_OPT_TYPE_BOOL, &_conf.nodeps },
|
|
{ "offline_root", OPKG_OPT_TYPE_STRING, &_conf.offline_root },
|
|
+ { "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
|
|
@@ -78,6 +78,7 @@ struct opkg_conf
|
|
int check_signature;
|
|
int nodeps; /* do not follow dependencies */
|
|
char *offline_root;
|
|
+ char *overlay_root;
|
|
int query_all;
|
|
int verbosity;
|
|
int noaction;
|
|
--- a/libopkg/opkg_install.c
|
|
+++ b/libopkg/opkg_install.c
|
|
@@ -21,6 +21,7 @@
|
|
#include <time.h>
|
|
#include <signal.h>
|
|
#include <unistd.h>
|
|
+#include <sys/stat.h>
|
|
|
|
#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;
|