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

SVN-Revision: 12328

diff --git a/feeds.conf b/feeds.conf
deleted file mode 100644 (file)
index 7463bb6..0000000
--- a/feeds.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-src-svn packages https://svn.openwrt.org/openwrt/packages
-src-svn xwrt http://x-wrt.googlecode.com/svn/trunk/package
-src-svn luci http://dev.leipzig.freifunk.net/svn/ff-luci/trunk/contrib/package

diff --git a/feeds.conf.default b/feeds.conf.default
new file mode 100644 (file)
index 0000000..7463bb6
--- /dev/null
+++ b/feeds.conf.default
@@ -0,0 +1,3 @@
+src-svn packages https://svn.openwrt.org/openwrt/packages
+src-svn xwrt http://x-wrt.googlecode.com/svn/trunk/package
+src-svn luci http://dev.leipzig.freifunk.net/svn/ff-luci/trunk/contrib/package

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/#.+$//;