From f644eb61da090484d554d572b8f12154b57fedb4 Mon Sep 17 00:00:00 2001
From: michele <>
Date: Sun, 25 Apr 2010 10:10:51 +0000
Subject: [PATCH] Add ldpd(8) to /etc/rc* files. It needs to be started before
 the routing daemons. In this way every new prefix learnt by them already has
 a label associated.

discussed with and ok'ed by claudio@
---
 src/etc/rc      | 6 +++++-
 src/etc/rc.conf | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index 622a6a21..a085b823 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.336 2010/04/23 06:29:36 ratchov Exp $
+#	$OpenBSD: rc,v 1.337 2010/04/25 10:10:51 michele Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -619,6 +619,10 @@ if [ X"${snmpd_flags}" != X"NO" ]; then
 	echo -n ' snmpd';		/usr/sbin/snmpd $snmpd_flags
 fi
 
+if [ X"${ldpd_flags}" != X"NO" ]; then
+	echo -n ' ldpd';		/usr/sbin/ldpd $ldpd_flags
+fi
+
 if [ X"${ripd_flags}" != X"NO" ]; then
 	echo -n ' ripd';		/usr/sbin/ripd $ripd_flags
 fi
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 39fc8c31..a29b8fb4 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,8 +1,9 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.135 2010/04/23 06:29:36 ratchov Exp $
+#	$OpenBSD: rc.conf,v 1.136 2010/04/25 10:10:51 michele Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
+ldpd_flags=NO		# for normal use: ""
 ripd_flags=NO		# for normal use: ""
 mrouted_flags=NO	# for normal use: "", if activated
 			# be sure to enable multicast_router below.