From: Alin Năstac Date: Wed, 14 Sep 2005 11:11:08 +0000 (+0000) Subject: Make zebra command line parameters configurable through conf.d (#102381) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f8e8df3ac26511a0a82f13643ad96254e843982e;p=gentoo.git Make zebra command line parameters configurable through conf.d (#102381) Package-Manager: portage-2.0.51.22-r2 --- diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog index d03395bb10ae..0157c3798101 100644 --- a/net-misc/quagga/ChangeLog +++ b/net-misc/quagga/ChangeLog @@ -2,7 +2,15 @@ # Copyright 1999-2005 Gentoo Foundation # Copyright 2003-2004 DataCore GmbH # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.19 2005/09/13 18:29:55 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.20 2005/09/14 11:11:08 mrness Exp $ + + 14 Sep 2005; Alin Nastac +files/bgpd.init, + -files/init/bgpd, -files/init/ospf6d, -files/init/ospfd, -files/init/ripd, + -files/init/ripngd, -files/init/zebra, +files/ospf6d.init, + +files/ospfd.init, +files/ripd.init, +files/ripngd.init, + +files/zebra.conf, +files/zebra.init, quagga-0.96.5-r1.ebuild, + quagga-0.98.2.ebuild, quagga-0.98.3.ebuild, quagga-0.98.4.ebuild: + Make zebra command line parameters configurable through conf.d (#102381). 13 Sep 2005; Alin Nastac quagga-0.98.2.ebuild, quagga-0.98.3.ebuild, quagga-0.98.4.ebuild: diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest index 031c9b2d3465..caab99935ba8 100644 --- a/net-misc/quagga/Manifest +++ b/net-misc/quagga/Manifest @@ -1,24 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 06a8e729cd2831e4dae30e0cbc2cb62a quagga-0.98.3.ebuild 4883 -MD5 e21bef9561207a5f68cd2de52ceff170 quagga-0.98.2.ebuild 4490 -MD5 dc9ceb74e15f8919c136137070c2ff80 ChangeLog 7805 -MD5 29639d7cea43800136e803866afa5bdf quagga-0.98.4.ebuild 4260 +MD5 c0a941e08060816c4c7068cd4023602c quagga-0.98.3.ebuild 4861 +MD5 d30997e32c750bff03590ab79f7276ff quagga-0.98.2.ebuild 4468 +MD5 c4bcfc277e856924ed9ba4cead328cba ChangeLog 8277 +MD5 c5d35e84e9953411d425350619e46b15 quagga-0.98.4.ebuild 4238 MD5 f0c8f9afaf3bbefcea71ff3b6fa139c4 metadata.xml 1389 -MD5 bf40271e4eafd69744cc6b8143733f88 quagga-0.96.5-r1.ebuild 3838 +MD5 7b34e71571fb66352e5e6713fe6840a2 quagga-0.96.5-r1.ebuild 3861 +MD5 cc109a746273bc0d6aee9d758e7524ab files/bgpd.init 900 +MD5 44547b687343ebfed7524cebc5626067 files/ospf6d.init 919 MD5 1a1df9fb95d48001187e1f56dc4ff5e5 files/digest-quagga-0.98.2 66 MD5 ab93cbbeeed343892eea7f9b79217a8b files/digest-quagga-0.98.3 66 MD5 8550c2f78b4c3ba7ba66c6bcb0bf4913 files/digest-quagga-0.98.4 147 +MD5 39b8cb21b55de53af38c94c2f5d85917 files/ripd.init 900 +MD5 120ab1b53975ec86e78266f31e935ab6 files/ripngd.init 920 MD5 9056b8bd752a672787eacb129ee47535 files/digest-quagga-0.96.5-r1 142 MD5 18c1046db57ea850aabd385058522cc4 files/quagga.env 25 MD5 0b834e6f9fd5d40f3018fb7e4ba04faa files/quagga.pam 1145 -MD5 cf38f951a51b3343a1314e600b3c5fe3 files/init/bgpd 900 -MD5 c10d85e098c8405567e6df707740ab85 files/init/ripd 900 -MD5 613ed2b9254132bf0d1dc40e530a5c6f files/init/ospfd 910 -MD5 21fee005d4bdb76ca10d09b8221aaf47 files/init/zebra 1161 -MD5 716ae5425e752e4c835c2883d905cac4 files/init/ospf6d 919 -MD5 615273280dd507a7b9705d200b68b8ec files/init/ripngd 920 +MD5 89b0cf4e70172bfcd195b2869cae28da files/ospfd.init 910 +MD5 c38e884372406e9e59616e436cd26388 files/zebra.conf 371 +MD5 2c1c5b782f96a74b48ccc496ad7a3865 files/zebra.init 1168 MD5 7da4097332468741416e156a2e5d35e4 files/patches-0.98.2/amir-connected-route.patch 6336 MD5 6c9cdbdc237bb8d24dfd26504059464b files/patches-0.98.2/ht-20050110-0.98.0-bgp-md5.patch 14570 MD5 e70bf25e2ca5f76efb2c5704234ccc1f files/patches-0.98.2/ht-20040304-classless-bgp.patch 1581 @@ -28,7 +29,7 @@ MD5 e70bf25e2ca5f76efb2c5704234ccc1f files/patches-0.98.3/ht-20040304-classless- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFDJxrENSP4Vda7IdsRAoEiAJ9aHiWT7BBl3PK8EyhI9Z24LGd1WQCcCjg0 -jz4ygCBUJhuQTMj9qTshw1g= -=Z9jd +iD8DBQFDKAVkNSP4Vda7IdsRAhXPAJ92dT40836Pr+s0x8EV30gLLpBiAwCfR+SV +ANB85ToVTVAmKFMBbVxmdiw= +=hC/h -----END PGP SIGNATURE----- diff --git a/net-misc/quagga/files/init/bgpd b/net-misc/quagga/files/bgpd.init similarity index 88% rename from net-misc/quagga/files/init/bgpd rename to net-misc/quagga/files/bgpd.init index b9398d0926d3..b6104235c39b 100644 --- a/net-misc/quagga/files/init/bgpd +++ b/net-misc/quagga/files/bgpd.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2003 DataCore GmbH, Amir Guindehi # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/init/bgpd,v 1.3 2005/08/11 09:01:32 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/bgpd.init,v 1.1 2005/09/14 11:11:08 mrness Exp $ depend() { need net zebra diff --git a/net-misc/quagga/files/init/ospf6d b/net-misc/quagga/files/ospf6d.init similarity index 88% rename from net-misc/quagga/files/init/ospf6d rename to net-misc/quagga/files/ospf6d.init index 06882df938d9..6edafe5f7450 100644 --- a/net-misc/quagga/files/init/ospf6d +++ b/net-misc/quagga/files/ospf6d.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2003 DataCore GmbH, Amir Guindehi # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/init/ospf6d,v 1.2 2005/08/11 09:01:32 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/ospf6d.init,v 1.1 2005/09/14 11:11:08 mrness Exp $ depend() { need net zebra diff --git a/net-misc/quagga/files/init/ospfd b/net-misc/quagga/files/ospfd.init similarity index 88% rename from net-misc/quagga/files/init/ospfd rename to net-misc/quagga/files/ospfd.init index 7a8bbc3f9f2b..f67ca2c154a0 100644 --- a/net-misc/quagga/files/init/ospfd +++ b/net-misc/quagga/files/ospfd.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2003 DataCore GmbH, Amir Guindehi # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/init/ospfd,v 1.2 2005/08/11 09:01:32 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/ospfd.init,v 1.1 2005/09/14 11:11:08 mrness Exp $ depend() { need net zebra diff --git a/net-misc/quagga/files/init/ripd b/net-misc/quagga/files/ripd.init similarity index 88% rename from net-misc/quagga/files/init/ripd rename to net-misc/quagga/files/ripd.init index a9795c01c211..987d6ec4b6ae 100644 --- a/net-misc/quagga/files/init/ripd +++ b/net-misc/quagga/files/ripd.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2003 DataCore GmbH, Amir Guindehi # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/init/ripd,v 1.2 2005/08/11 09:01:32 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/ripd.init,v 1.1 2005/09/14 11:11:08 mrness Exp $ depend() { need net zebra diff --git a/net-misc/quagga/files/init/ripngd b/net-misc/quagga/files/ripngd.init similarity index 88% rename from net-misc/quagga/files/init/ripngd rename to net-misc/quagga/files/ripngd.init index f67560b8bf28..9bf2ff2a8729 100644 --- a/net-misc/quagga/files/init/ripngd +++ b/net-misc/quagga/files/ripngd.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2003 DataCore GmbH, Amir Guindehi # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/init/ripngd,v 1.2 2005/08/11 09:01:32 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/ripngd.init,v 1.1 2005/09/14 11:11:08 mrness Exp $ depend() { need net zebra diff --git a/net-misc/quagga/files/zebra.conf b/net-misc/quagga/files/zebra.conf new file mode 100644 index 000000000000..a5256acd04d4 --- /dev/null +++ b/net-misc/quagga/files/zebra.conf @@ -0,0 +1,7 @@ +# Additional command-line parameters to run zebra with: +# -k, --keep_kernel Don't delete old routes which installed by zebra. +# -l, --log_mode number Set verbose log mode flag +# -A, --vty_addr addr Set vty's bind address +# -P, --vty_port port Set vty's port number +# -r, --retain When program terminates, retain added route by zebra. +ZEBRA_OPTS="-l 255" diff --git a/net-misc/quagga/files/init/zebra b/net-misc/quagga/files/zebra.init similarity index 85% rename from net-misc/quagga/files/init/zebra rename to net-misc/quagga/files/zebra.init index 1d83e19a66c6..45c90bf03736 100644 --- a/net-misc/quagga/files/init/zebra +++ b/net-misc/quagga/files/zebra.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/init/zebra,v 1.3 2005/08/11 09:01:32 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/zebra.init,v 1.1 2005/09/14 11:11:08 mrness Exp $ depend() { need net @@ -33,7 +33,7 @@ start() { ebegin "Starting zebra" start-stop-daemon --start --quiet --exec /usr/sbin/zebra \ - -- -d -l 255 -f /etc/quagga/zebra.conf \ + -- -d -f /etc/quagga/zebra.conf ${ZEBRA_OPTS} \ --pid_file /var/run/quagga/zebra.pid result=$? eend $result diff --git a/net-misc/quagga/quagga-0.96.5-r1.ebuild b/net-misc/quagga/quagga-0.96.5-r1.ebuild index c5e0c76a807d..5d304156a91f 100644 --- a/net-misc/quagga/quagga-0.96.5-r1.ebuild +++ b/net-misc/quagga/quagga-0.96.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.96.5-r1.ebuild,v 1.4 2005/08/11 09:24:42 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.96.5-r1.ebuild,v 1.5 2005/09/14 11:11:08 mrness Exp $ inherit eutils @@ -99,14 +99,12 @@ src_install() { keepdir /var/run/quagga || die - exeinto /etc/init.d - newexe ${FILESDIR}/init/zebra zebra || die - newexe ${FILESDIR}/init/ripd ripd || die - newexe ${FILESDIR}/init/ospfd ospfd || die - newexe ${FILESDIR}/init/bgpd bgpd || die - - use ipv6 && ( newexe ${FILESDIR}/init/ripngd ripngd ) - use ipv6 && ( newexe ${FILESDIR}/init/ospf6d ospf6d ) + local i MY_SERVICES_LIST="zebra ripd ospfd bgpd" + use ipv6 && MY_SERVICES_LIST="${MY_SERVICES_LIST} ripngd ospf6d" + for i in ${MY_SERVICES_LIST} ; do + newinitd ${FILESDIR}/${i}.init ${i} || die "failed to install ${i} init.d script" + done + newconfd ${FILESDIR}/zebra.conf zebra || die "failed to install zebra conf.d script" } pkg_postinst() { diff --git a/net-misc/quagga/quagga-0.98.2.ebuild b/net-misc/quagga/quagga-0.98.2.ebuild index 263a30a03aa9..d7fcb0448610 100644 --- a/net-misc/quagga/quagga-0.98.2.ebuild +++ b/net-misc/quagga/quagga-0.98.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.2.ebuild,v 1.8 2005/09/13 18:29:55 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.2.ebuild,v 1.9 2005/09/14 11:11:08 mrness Exp $ inherit eutils @@ -102,13 +102,12 @@ src_install() { keepdir /var/run/quagga || die - exeinto /etc/init.d - newexe ${FILESDIR}/init/zebra zebra && \ - newexe ${FILESDIR}/init/ripd ripd && \ - newexe ${FILESDIR}/init/ospfd ospfd && \ - ( ! use ipv6 || newexe ${FILESDIR}/init/ripngd ripngd ) && \ - ( ! use ipv6 || newexe ${FILESDIR}/init/ospf6d ospf6d ) && \ - newexe ${FILESDIR}/init/bgpd bgpd || die "failed to install init scripts" + local i MY_SERVICES_LIST="zebra ripd ospfd bgpd" + use ipv6 && MY_SERVICES_LIST="${MY_SERVICES_LIST} ripngd ospf6d" + for i in ${MY_SERVICES_LIST} ; do + newinitd ${FILESDIR}/${i}.init ${i} || die "failed to install ${i} init.d script" + done + newconfd ${FILESDIR}/zebra.conf zebra || die "failed to install zebra conf.d script" if use pam; then insinto /etc/pam.d diff --git a/net-misc/quagga/quagga-0.98.3.ebuild b/net-misc/quagga/quagga-0.98.3.ebuild index b1ee2ebf74c4..d14e233c1ac0 100644 --- a/net-misc/quagga/quagga-0.98.3.ebuild +++ b/net-misc/quagga/quagga-0.98.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.3.ebuild,v 1.4 2005/09/13 18:29:55 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.3.ebuild,v 1.5 2005/09/14 11:11:08 mrness Exp $ inherit eutils @@ -102,13 +102,12 @@ src_install() { keepdir /var/run/quagga || die - exeinto /etc/init.d - newexe ${FILESDIR}/init/zebra zebra && \ - newexe ${FILESDIR}/init/ripd ripd && \ - newexe ${FILESDIR}/init/ospfd ospfd && \ - ( ! use ipv6 || newexe ${FILESDIR}/init/ripngd ripngd ) && \ - ( ! use ipv6 || newexe ${FILESDIR}/init/ospf6d ospf6d ) && \ - newexe ${FILESDIR}/init/bgpd bgpd || die "failed to install init scripts" + local i MY_SERVICES_LIST="zebra ripd ospfd bgpd" + use ipv6 && MY_SERVICES_LIST="${MY_SERVICES_LIST} ripngd ospf6d" + for i in ${MY_SERVICES_LIST} ; do + newinitd ${FILESDIR}/${i}.init ${i} || die "failed to install ${i} init.d script" + done + newconfd ${FILESDIR}/zebra.conf zebra || die "failed to install zebra conf.d script" if use pam; then insinto /etc/pam.d diff --git a/net-misc/quagga/quagga-0.98.4.ebuild b/net-misc/quagga/quagga-0.98.4.ebuild index 138da92340af..c90f9c2dbe18 100644 --- a/net-misc/quagga/quagga-0.98.4.ebuild +++ b/net-misc/quagga/quagga-0.98.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.4.ebuild,v 1.3 2005/09/13 18:29:55 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.4.ebuild,v 1.4 2005/09/14 11:11:08 mrness Exp $ inherit eutils multilib @@ -81,13 +81,12 @@ src_install() { keepdir /var/run/quagga || die - exeinto /etc/init.d - newexe ${FILESDIR}/init/zebra zebra && \ - newexe ${FILESDIR}/init/ripd ripd && \ - newexe ${FILESDIR}/init/ospfd ospfd && \ - ( ! use ipv6 || newexe ${FILESDIR}/init/ripngd ripngd ) && \ - ( ! use ipv6 || newexe ${FILESDIR}/init/ospf6d ospf6d ) && \ - newexe ${FILESDIR}/init/bgpd bgpd || die "failed to install init scripts" + local i MY_SERVICES_LIST="zebra ripd ospfd bgpd" + use ipv6 && MY_SERVICES_LIST="${MY_SERVICES_LIST} ripngd ospf6d" + for i in ${MY_SERVICES_LIST} ; do + newinitd ${FILESDIR}/${i}.init ${i} || die "failed to install ${i} init.d script" + done + newconfd ${FILESDIR}/zebra.conf zebra || die "failed to install zebra conf.d script" if use pam; then insinto /etc/pam.d