2 files changed, 19 insertions, 5 deletions
diff --git a/sysutils/cbsd/files/cbsdd.in b/sysutils/cbsd/files/cbsdd.in
index 9127d7df9ea1..f1c7c47c443b 100644
--- a/sysutils/cbsd/files/cbsdd.in
+++ b/sysutils/cbsd/files/cbsdd.in
@@ -23,16 +23,31 @@ if [ ! -f ${globalconf} ]; then
     exit 1
 fi
 
-. ${globalconf}
-. ${inventory}
-. ${mdtools}
-. ${subr}
+if [ ! -f ${inventory} ]; then
+    echo "cbsd: no such ${inventory}";
+    exit 1
+fi
+
+if [ ! -f ${mdtools} ]; then
+    echo "cbsd: no such ${mdtools}";
+    exit 1
+fi
+
+if [ ! -f ${subr} ]; then
+    echo "cbsd: no such ${subr}";
+    exit 1
+fi
 
 if [ ! -f ${localcbsdconf} ]; then
     echo "cbsd: no such ${localcbsdconf}";
     exit 1
 fi
 
+. ${globalconf}
+. ${inventory}
+. ${mdtools}
+. ${subr}
+
 . ${localcbsdconf}
 
 start_precmd=${name}_prestart
diff --git a/sysutils/cbsd/files/cbsdrsyncd.in b/sysutils/cbsd/files/cbsdrsyncd.in
index 4dabb1ea204e..fe554dd9dbe2 100644
--- a/sysutils/cbsd/files/cbsdrsyncd.in
+++ b/sysutils/cbsd/files/cbsdrsyncd.in
@@ -10,7 +10,6 @@
 #
 
 . /etc/rc.subr
-. /etc/rc.conf
 
 name="cbsdrsyncd"
 rcvar=cbsdrsyncd_enable