From 76c0c63ed3e198686814cc038ede925d6450da73 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 17 Aug 2008 09:05:01 +0000
Subject: 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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12328 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 feeds.conf         | 3 ---
 feeds.conf.default | 3 +++
 scripts/feeds      | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 feeds.conf
 create mode 100644 feeds.conf.default

diff --git a/feeds.conf b/feeds.conf
deleted file mode 100644
index 7463bb644..000000000
--- 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 000000000..7463bb644
--- /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 6b09f7ee4..ee2f108ef 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/#.+$//;
-- 
cgit v1.2.3