Index: scripts/setup.sh
===================================================================
diff -u -r8153639f3cd191aaf8b384e3b8aadde2d51da4ea -rc9ffbabff65632552e25a7028e82a027580836b7
--- scripts/setup.sh	(.../setup.sh)	(revision 8153639f3cd191aaf8b384e3b8aadde2d51da4ea)
+++ scripts/setup.sh	(.../setup.sh)	(revision c9ffbabff65632552e25a7028e82a027580836b7)
@@ -121,11 +121,13 @@
 }
 
 function disable_unwanted_services() {
-  disable_service b2qt
-  disable_service connman
-  disable_service qtlauncher
-  disable_service ebikedata
-  disable_service rpcbind  
+  disable_service b2qt.service
+  disable_service connman.service
+  disable_service qtlauncher.service
+  disable_service ebikedata.service
+  disable_service rpcbind.service
+  disable_service rpcbind.socket
+  disable_service rpcbind.target
 }
 
 function setup_denali() {