--- mcore-src/trunk/mcore-tools/daemon/client/include/system.client.class	2011/02/17 20:18:09	1335
+++ mcore-src/trunk/mcore-tools/daemon/client/include/system.client.class	2011/02/17 20:18:46	1336
@@ -31,7 +31,7 @@
 	mecho "set system.console [user]"
 	mecho " Opens a console with user or root privileges."
 	mecho " Known users:"
-	mecho "   mcore  - mcore standard user only with user privileges"
+	mecho "   ${MCORE_UNPRIV_USER}  - mcore standard user only with user privileges"
 	mecho "   root   - mcore root user with full system privileges"
 }
 
@@ -39,7 +39,7 @@
 {
 	mecho "set system.passwd [user] [password]"
 	mecho " Sets a system password for given user."
-	mecho "  Allowed users: mcore, root"
+	mecho "  Allowed users: ${MCORE_UNPRIV_USER}, root"
 	mecho "  If password is empty, the current password will be deleted."
 }
 
@@ -61,7 +61,7 @@
 	[[ -z ${user} ]] && help_system_console && return 1
 
 	case "${user}" in
-		mcore) x11runas "rxvt &" ;;
+		${MCORE_UNPRIV_USER}) x11runas "rxvt &" ;;
 		root)  x11runas "rxvt -T 'Login as root' -e /bin/bash -c 'echo \"Login as root\";exec /bin/login root' &" ;;
 		*)     help_system_console && return 1 ;;
 	esac
@@ -114,7 +114,7 @@
 	[[ -z ${pass} ]] && mecho "deleting password!"
 
 	case "${user}" in
-		root|mcore) (echo "${pass}"; sleep 0.1; echo "${pass}") | passwd "${user}" ;;
+		root|${MCORE_UNPRIV_USER}) (echo "${pass}"; sleep 0.1; echo "${pass}") | passwd "${user}" ;;
 		*) help_system_passwd && return 1 ;;
 	esac
 }