[backfire] merge r23029, r23030, r23031 and r23032

[openwrt-10.03/.git] / package / opkg / patches / 011-old-config-location.patch

diff --git a/package/opkg/patches/011-old-config-location.patch b/package/opkg/patches/011-old-config-location.patch
index 931f4f11648238a16316d021df5803630eed6303..4094713f3483925e788baf777d3a3011dc450635 100644 (file)
--- a/package/opkg/patches/011-old-config-location.patch
+++ b/package/opkg/patches/011-old-config-location.patch
@@ -6,7 +6,7 @@
        }
 -    
 +
-+      if(!conf->conf_file)
++      if(!conf->conf_file && !conf->offline_root)
 +              conf->conf_file = xstrdup("/etc/opkg.conf");
 +
        if (parse_err)