From: Martin Winter <mwinter@opensourcerouting.org>
Date: Mon, 12 Jun 2017 23:14:03 +0000 (-0700)
Subject: debianpkg: Do not start package after installation
X-Git-Tag: frr-3.0-rc3~1^2~24
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=fd623c4f8bf881fdbb3147dacff2118599cf13fc;p=mirror_frr.git

debianpkg: Do not start package after installation

- Remove auto-start from Ubuntu 12.04 Backport
- Update Doc to explain on how to enable startup

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
---

diff --git a/debianpkg/README.deb_build.md b/debianpkg/README.deb_build.md
index 617c2fb37..3156c3672 100644
--- a/debianpkg/README.deb_build.md
+++ b/debianpkg/README.deb_build.md
@@ -71,13 +71,32 @@ the sources (`frr_*.orig.tar.gz`, `frr_*.debian.tar.xz` and `frr_*.dsc`)
 Enabling daemons after installation of the package:
 ---------------------------------------------------
 
-1. Edit /etc/frr/daemons and enable required routing daemons (Zebra is probably needed for most deployments, so make sure to enable it.)
+1. Edit `/etc/frr/daemons` and enable required routing daemons (Zebra is
+probably needed for most deployments, so make sure to enable it.)
  
 2. Check your firewall / IPtables to make sure the routing protocols are
 allowed.
         
-3. Start/Restart the daemons (or reboot)
+3. Enable FRR at startup
 
-        systemctl restart frr
-            
-Configuration is stored in `/etc/frr/*.conf` files and daemon selection is stored in `/etc/frr/daemons`.
+    - On `init.d` based systems (Ubuntu 12.04)
+
+            sudo update-rc.d frr defaults
+
+    - On `systemd` based systems (Debian 8, Ubuntu 14.04, 16.04)
+
+            sudo systemctl enable frr
+
+4. Start/Restart the daemons (or reboot)
+
+    - On `init.d` based systems (Ubuntu 12.04)
+
+            sudo invoke-rc.d frr start
+
+    - on `systemd` based systems (Debian 8, Ubuntu 14.04, 16.04)
+
+            sudo systemctl start frr
+
+
+Configuration is stored in `/etc/frr/*.conf` files and daemon selection
+is stored in `/etc/frr/daemons`.
diff --git a/debianpkg/backports/ubuntu12.04/debian/frr.postinst b/debianpkg/backports/ubuntu12.04/debian/frr.postinst
index 5f1918b27..9020d7bf7 100644
--- a/debianpkg/backports/ubuntu12.04/debian/frr.postinst
+++ b/debianpkg/backports/ubuntu12.04/debian/frr.postinst
@@ -36,12 +36,5 @@ fi
 
 db_stop
 
-if [ -x "/etc/init.d/frr" ] || [ -e "/etc/init/frr.conf" ]; then
-	if [ ! -e "/etc/init/frr.conf" ]; then
-		update-rc.d frr defaults >/dev/null
-	fi
-	invoke-rc.d frr start || exit $?
-fi
-
 #DEBHELPER#