From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 17 Aug 2008 09:05:01 +0000 (+0000)
Subject: rename feeds.conf to feeds.conf.default, make feeds.conf override feeds.conf.default... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fflorian.git;a=commitdiff_plain;h=a74bb3b4173ed5cd86bece29312c2103bd79dc37

rename feeds.conf to feeds.conf.default, make feeds.conf override feeds.conf.default this makes it possible to change the feeds lists without having the version control system record it as a change

SVN-Revision: 12328
---

diff --git a/feeds.conf b/feeds.conf
deleted file mode 100644
index 7463bb6448..0000000000
--- 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
index 0000000000..7463bb6448
--- /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 6b09f7ee41..ee2f108efd 100755
--- 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/#.+$//;