Merge remote-tracking branch 'gfiber-internal/master' into bruno
diff --git a/102-cwmpd.sh b/102-cwmpd.sh
index b2b9bc9..b66e7a6 100755
--- a/102-cwmpd.sh
+++ b/102-cwmpd.sh
@@ -10,3 +10,5 @@
 
 echo ls | cwmp | WVPASS grep X_CATAWAMPUS-ORG_CATAWAMPUS
 echo ls | cwmp | WVFAIL grep NON_EXISTENT_NAME
+
+WVPASS cwmp rlist /
diff --git a/201-services.sh b/201-services.sh
new file mode 100755
index 0000000..d98d1ea
--- /dev/null
+++ b/201-services.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+. ./wvtest/wvtest.sh
+
+running() {
+  [ -n "$(pgrep -x "$1")" ]
+}
+
+running_full() {
+  [ -n "$(pgrep -f "$1")" ]
+}
+
+WVSTART "service_check"
+
+# System services
+WVPASS running gpio-mailbox
+WVPASS running klogd
+WVPASS running mocad
+WVPASS running ntpd
+WVPASS running syslogd
+WVPASS running sysmgr
+WVPASS running cwmpd
+
+# TV services
+WVPASS running miniclient
+WVPASS running siege
+
+# Helper services
+WVPASS running cpulog
+WVPASS running_full upload-logs-loop
+
+# Platform dependent
+if is-storage-box; then
+  WVPASS running nmbd
+  WVPASS running sagesrv
+  WVPASS running smbd
+fi