------------------------------------------------------------------------
r2846 | niro | 2018-11-21 11:54:28 +0100 (Mi, 21. Nov 2018) | 1 Zeile

-fixed configuration issues with auto config. if device config.d is not empty, a device xorg config will be written. hdmi config has broken this behavior

Index: mcore-tools/src/modules/basic-video/graphic.client.class.in
===================================================================
--- mcore-tools/src/modules/basic-video/graphic.client.class.in	(Revision 2845)
+++ mcore-tools/src/modules/basic-video/graphic.client.class.in	(Revision 2846)
@@ -87,9 +87,9 @@
 		write_zotac_quirk=1
 	fi
 
-	if [ -f ${MROOT}/${MCORE_CONFIG_PATH}/xorg/device/hdmi ]
+	if [ -f ${MROOT}/${MCORE_CONFIG_PATH}/xorg/hdmi/hdmi ]
 	then
-		source ${MROOT}/${MCORE_CONFIG_PATH}/xorg/device/hdmi
+		source ${MROOT}/${MCORE_CONFIG_PATH}/xorg/hdmi/hdmi
 		case "${graphic_hdmi}" in
 			enable) write_zotac_quirk=0 ;;
 			disable) write_zotac_quirk=1 ;;
@@ -254,7 +254,7 @@
 
 	case "${action}" in
 		enable|disable)
-			CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/device/hdmi"
+			CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/hdmi/hdmi"
 			clearconfig
 			addconfig "graphic_hdmi=\"${action}\""
 			;;
@@ -270,7 +270,7 @@
 	local action="${CLASS_ARGV[0]}"
 	local driverdir="@@LIBDIR@@/xorg/modules/drivers"
 	local driver
-	local config="${MCORE_CONFIG_PATH}/xorg/device/25-device.conf"
+	local config="${MROOT}/${MCORE_CONFIG_PATH}/xorg/device/25-device.conf"
 	local i
 
 	case "${action}" in
@@ -296,7 +296,7 @@
 
 get_graphic_hdmi()
 {
-	local CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/device/hdmi"
+	local CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/hdmi/hdmi"
 	if [ -f ${CONFIG} ]
 	then
 		rvecho "$(< ${CONFIG})"

------------------------------------------------------------------------