Index: scripts/setup.sh
===================================================================
diff -u -r21e5474c3b148fa1337b5d10d9cb4562c209faf9 -r4d4e46cf7c5db285778851245767b93b5882c1bc
--- scripts/setup.sh	(.../setup.sh)	(revision 21e5474c3b148fa1337b5d10d9cb4562c209faf9)
+++ scripts/setup.sh	(.../setup.sh)	(revision 4d4e46cf7c5db285778851245767b93b5882c1bc)
@@ -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() {