- use /etc/bird dir

diff --git a/bird2.init b/bird2.init
index 00f9d6abb62c529b169c3f6e57293c673479997d..87fae58420511e728fb8ddc289206784eb31959c 100644 (file)
--- a/bird2.init
+++ b/bird2.init
@@ -7,7 +7,7 @@
 # description: Dynamic Route Daemon for IPv4/IPv6 routers
 #
 # processname: bird
-# config:      /etc/bird.conf
+# config:      /etc/bird/bird.conf
 
 
 # Source function library
@@ -30,7 +30,7 @@ else
 fi
 
 # Sanity checks.
-[ -f /etc/bird.conf ] || exit 0
+[ -f /etc/bird/bird.conf ] || exit 0
 
 RETVAL=0
 # See how we were called.

diff --git a/bird2.spec b/bird2.spec
index ceb651403c762034372be9b816fe6a0e9aeb6066..535ac3e64ee8d080976aafc996df4061165c0521 100644 (file)
--- a/bird2.spec
+++ b/bird2.spec
@@ -43,6 +43,8 @@ Obsoletes:    zebra
 Obsoletes:     zebra-guile
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _sysconfdir     /etc/bird
+
 %description
 The BIRD project is an attempt to create a routing daemon running on
 UNIX-like systems (but not necessarily limited to them) with full
@@ -112,6 +114,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc %{?with_docs:obj/doc/*.html} doc/reply_codes bird-doc-%{version}/doc/*.pdf ChangeLog NEWS README 
+%dir %{_sysconfdir}
 %attr(755,root,root) %{_sbindir}/bird
 %attr(755,root,root) %{_sbindir}/birdc
 %attr(755,root,root) %{_sbindir}/birdcl