From: Donald Sharp Date: Tue, 1 Mar 2016 00:52:40 +0000 (-0500) Subject: debian: Remove some unnecesary files from debian directory. X-Git-Tag: frr-2.0-rc1~1089 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=54046401ad1ce188f1d6cd6099c7ee75e09c7328;p=mirror%2Ffrr.git debian: Remove some unnecesary files from debian directory. The daemons file is no longer needed as well as the debian.conf file. They have been subsumed by the systemd initialization methodology. Ticket: CM-9581 Signed-off-by: Donald Sharp Reviewed-by: Daniel Walton --- diff --git a/debian/my/daemons b/debian/my/daemons deleted file mode 100644 index 7df77968ae..0000000000 --- a/debian/my/daemons +++ /dev/null @@ -1,30 +0,0 @@ -# This file tells the quagga package which daemons to start. -# -# Entries are in the format: =(yes|no|priority) -# 0, "no" = disabled -# 1, "yes" = highest priority -# 2 .. 10 = lower priorities -# Read /usr/share/doc/quagga/README.Debian for details. -# -# Sample configurations for these daemons can be found in -# /usr/share/doc/quagga/examples/. -# -# ATTENTION: -# -# When activation a daemon at the first time, a config file, even if it is -# empty, has to be present *and* be owned by the user and group "quagga", else -# the daemon will not be started by /etc/init.d/quagga. The permissions should -# be u=rw,g=r,o=. -# When using "vtysh" such a config file is also needed. It should be owned by -# group "quaggavty" and set to ug=rw,o= though. Check /etc/pam.d/quagga, too. -# -# The watchquagga daemon is always started. Per default in monitoring-only but -# that can be changed via /etc/quagga/debian.conf. -# -zebra=no -bgpd=no -ospfd=no -ospf6d=no -ripd=no -ripngd=no -isisd=no diff --git a/debian/my/debian.conf b/debian/my/debian.conf deleted file mode 100644 index c600ec58d2..0000000000 --- a/debian/my/debian.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# If this option is set the /etc/init.d/quagga script automatically loads -# the config via "vtysh -b" when the servers are started. -# Check /etc/pam.d/quagga if you intend to use "vtysh"! -# -vtysh_enable=yes -zebra_options=" --daemon -A 127.0.0.1" -bgpd_options=" --daemon -A 127.0.0.1" -ospfd_options=" --daemon -A 127.0.0.1" -ospf6d_options=" --daemon -A ::1" -ripd_options=" --daemon -A 127.0.0.1" -ripngd_options=" --daemon -A ::1" -isisd_options=" --daemon -A 127.0.0.1" -# -# Please note that watchquagga_options is an array and not a string so that -# quotes can be used. -# -# The list of daemons to watch is automatically generated by the init script -# from daemons.conf and appended to the watchquagga_options. -# Example: -# watchquagga_options=("-Adz" "-r" '/sbin/service %s restart' -s '/sbin/service %s start' -k '/sbin/service %s stop') -watchquagga_enable=yes -watchquagga_options=(--daemon) diff --git a/debian/rules b/debian/rules index f8fc2fa4d5..90c8574e83 100755 --- a/debian/rules +++ b/debian/rules @@ -101,8 +101,6 @@ override_dh_auto_install: # install config files mkdir -p debian/tmp/etc/quagga/ - cp debian/my/debian.conf debian/tmp/etc/quagga/ - cp debian/my/daemons debian/tmp/etc/quagga/ perl -pi -e 's#^!log file #!log file /var/log/quagga/#' debian/tmp/usr/share/doc/quagga/examples/*sample* # installing the Quagga specific SNMP MIB