commit f08a7376e9cfa6448b4637662d14631b4b79a4d5
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Feb 09 21:28:19 2015 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Feb 15 12:43:49 2015 -0800
tree bdd27612aa1f0c8b85d8b666efac3a8534539e8b
parent 63df436e5f165605a5aebcace9012551470da5d0

daemon+rib: Merge nrd and nfd into a single process (separate threads)

Change-Id: I41952d5b8ee29f109130c570e0d13ccad6970d2f
Refs: #2489

tools/nfd-start.sh

diff --git a/tools/nfd-start.sh b/tools/nfd-start.sh
index 4df12d7..4c14e07 100755
--- a/tools/nfd-start.sh
+++ b/tools/nfd-start.sh
@@ -6,7 +6,7 @@
   -h)
     echo Usage
     echo $0
-    echo "  Start NFD and RIB Management daemon"
+    echo "  Start NFD"
     exit 0
     ;;
   -V)
@@ -30,11 +30,10 @@
 }
 
 hasNFD=$(hasProcess nfd)
-hasNRD=$(hasProcess nrd)
 
-if [[ -n $hasNFD$hasNRD ]]
+if [[ -n $hasNFD ]]
 then
-  echo 'NFD or NRD is already running...'
+  echo 'NFD is already running...'
   exit 1
 fi
 
@@ -49,7 +48,10 @@
   exit 2
 fi
 
-sudo nfd &
-sleep 2
-nrd &
-sleep 2
+sudo @BINDIR@/nfd &
+
+if [ -f @SYSCONFDIR@/ndn/nfd-init.sh ]; then
+    sleep 2 # post-start is executed just after nfd process starts, but there is no guarantee
+    # that all initialization has been finished
+    . @SYSCONFDIR@/ndn/nfd-init.sh
+fi