--- mcore-src/trunk/mcore-tools/daemon/client/include/vnc.client.class	2013/05/08 16:00:40	2070
+++ mcore-src/trunk/mcore-tools/src/modules/tigervnc/vnc.client.class.in	2014/01/10 14:10:39	2172
@@ -37,8 +37,8 @@
 	local CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/screen/99-vnc.conf"
 	clearconfig
 	addconfig '	Option "SecurityTypes" "VncAuth"'
-        addconfig '	Option "UserPasswdVerifier" "VncAuth"'
-        addconfig '	Option "PasswordFile" "/root/.vnc/passwd"'
+	addconfig '	Option "UserPasswdVerifier" "VncAuth"'
+	addconfig '	Option "PasswordFile" "/root/.vnc/passwd"'
 
 	# requires graphic!
 	helper_graphic_rebuild_xorg_conf_d
@@ -62,9 +62,9 @@
 
 get_vnc_service()
 {
-	if [ -f ${MROOT}/etc/X11/xorg.conf.d/25-module.conf ]
+	if [ -f ${MROOT}@@SYSCONFDIR@@/X11/xorg.conf.d/25-module.conf ]
 	then
-		if [[ -n $(grep 'Load.*vnc' ${MROOT}/etc/X11/xorg.conf.d/25-module.conf) ]]
+		if [[ -n $(grep 'Load.*vnc' ${MROOT}@@SYSCONFDIR@@/X11/xorg.conf.d/25-module.conf) ]]
 		then
 			mecho "VNC facility is enabled."
 			rvecho "1"
@@ -109,8 +109,10 @@
 set_vnc_passwd()
 {
 	local pass="$1"
-	local vncpasswd="${MROOT}/root/.vnc/passwd"
+	local vncconfigdir="${MROOT}/root/.vnc"
+	local vncpasswd="${vncconfigdir}/passwd"
 	[[ -z ${pass} ]] && help_vnc_passwd && return 1
+	[ -d ${vncconfigdir} ] || install -d ${vncconfigdir}
 
 	vncpasswd "${vncpasswd}" > /dev/null << EOF
 ${pass}