Merge pull request #100 from brianhlin/SOFTWARE-5478.multiuser-origin

Fix origin service enabling/disabling (SOFTWARE-5478)

Author: matyasselmeci

stash-origin/image-config.d/10-stash-origin.sh

@@ -16,13 +16,17 @@ if [[ $XC_AUTH_ORIGIN_EXPORT ]]; then
   if [[ -n $XC_ENABLE_MULTIUSER ]]; then
     supervisord_enable stash-origin-auth-privileged
     supervisord_enable stash-origin-auth-cmsd-privileged
+    supervisord_disable stash-origin-auth
+    supervisord_disable stash-origin-auth-cmsd
   else
     supervisord_enable stash-origin-auth
     supervisord_enable stash-origin-auth-cmsd
+    supervisord_disable stash-origin-auth-privileged
+    supervisord_disable stash-origin-auth-cmsd-privileged
   fi
 else
-  supervisord_enable stash-origin-auth-privileged
-  supervisord_enable stash-origin-auth-cmsd-privileged
+  supervisord_disable stash-origin-auth-privileged
+  supervisord_disable stash-origin-auth-cmsd-privileged
   supervisord_disable stash-origin-auth
   supervisord_disable stash-origin-auth-cmsd
 fi