projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[package] iwinfo: add more device entries
[openwrt.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..05559268648ac7b08ebcd8dd3f704d69dc96fece 100644
(file)
--- a/
package/opkg/patches/011-old-config-location.patch
+++ b/
package/opkg/patches/011-old-config-location.patch
@@
-1,13
+1,11
@@
--- a/src/opkg-cl.c
+++ b/src/opkg-cl.c
--- a/src/opkg-cl.c
+++ b/src/opkg-cl.c
-@@ -169,7 +169,10 @@
- printf("Confusion: getopt_long returned %d\n", c);
+@@ -207,6 +207,9 @@ args_parse(int argc, char *argv[])
}
}
}
}
--
-+
-+ 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;
+
if (parse_err)
return parse_err;