[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 40d0b7566506258efda659b9ee69a38e6113e488..4094713f3483925e788baf777d3a3011dc450635 100644 (file)
--- a/package/opkg/patches/011-old-config-location.patch
+++ b/package/opkg/patches/011-old-config-location.patch
@@ -1,13 +1,13 @@
 --- a/src/opkg-cl.c
 +++ b/src/opkg-cl.c
-@@ -169,7 +169,10 @@
+@@ -172,7 +172,10 @@ args_parse(int argc, char *argv[])
                        printf("Confusion: getopt_long returned %d\n", c);
                }
        }
 -    
 +
-+      if(!conf->conf_file)
-+              conf->conf_file = "/etc/opkg.conf";
++      if(!conf->conf_file && !conf->offline_root)
++              conf->conf_file = xstrdup("/etc/opkg.conf");
 +
        if (parse_err)
                return parse_err;