rename feeds.conf to feeds.conf.default, make feeds.conf override feeds.conf.default...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12328 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/feeds.conf b/feeds.conf.default
similarity index 100%
rename from feeds.conf
rename to feeds.conf.default

diff --git a/scripts/feeds b/scripts/feeds
index 6b09f7ee4152d734a7018df46a6c6e8fe3d00396..ee2f108efdbf455359c5b2faefdd993f7da58c00 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -23,7 +23,9 @@ sub parse_config() {
        my $line = 0;
        my %name;
 
-       open FEEDS, "feeds.conf";
+       open FEEDS, "feeds.conf" or
+               open FEEDS, "feeds.conf.default" or
+               die "Unable to open feeds configuration";
        while (<FEEDS>) {
                chomp;
                s/#.+$//;