Diff of /mcore-src/trunk/mcore-tools/src/modules/hwinfo/hardware.control.class.in

Parent Directory | Revision Log | Patch

	revision 2498 by niro, Thu Sep 10 14:11:50 2015 UTC	revision 2618 by niro, Fri Sep 25 07:35:56 2015 UTC
#	Line 4  provide hardware	Line 4  provide hardware
4	require hwdetection	require hwdetection
5	require mysql	require mysql
6
7	set_hardware_detect()	run_hardware_detect()
8	{	{
9	local serial="${CLASS_ARGV[0]}"	local serial="$1"
10
11	local cmd	local cmd
12	local netcard_driver	local netcard_driver
#	Line 16  set_hardware_detect()	Line 16  set_hardware_detect()
16	local graphic_driver	local graphic_driver
17	local monitor_info	local monitor_info
18	local monitor_resolution	local monitor_resolution
19		local keymap
20	local hwdetected	local hwdetected
21		local auth
22		local i
23
24		if [[ -z ${serial} ]]
25		then
26		decho "No serial given"
27		return 1
28		fi
29
30	# first check if hardware detect was already done	# first check if hardware detect was already done
31	hwdetected=$(mysqldo "select hwdetected from client_serials where serial=${serial};")	hwdetected=$(mysqldo "select hwdetected from client_serials where serial=${serial};")
#	Line 30  set_hardware_detect()	Line 39  set_hardware_detect()
39
40	nsslsay_queue_init	nsslsay_queue_init
41	nsslsay_queue_add "nocolors"	nsslsay_queue_add "nocolors"
42	nsslsay_queue_add "get hardware.detect driver netcard"	#nsslsay_queue_add "get hardware.detect driver netcard"
43		nsslsay_queue_add "get hardware.detect driver connected-iface"
44	netcard_driver=$(control_client "${serial}" run-queue)	netcard_driver=$(control_client "${serial}" run-queue)
45	if [[ -n ${netcard_driver} ]]	if [[ -n ${netcard_driver} ]]
46	then	then
#	Line 86  set_hardware_detect()	Line 96  set_hardware_detect()
96	decho "no monitor_resolution found"	decho "no monitor_resolution found"
97	fi	fi
98
99		keymap=$(mysqldo "select keymap from cfg_input where serial=${serial};")
100		if [[ -z ${keymap} ]] || [[ ${keymap} = NULL ]]
101		then
102		# set keymap to MCORE_DEFAULT_KEYMAP
103		decho "keymap='${MCORE_DEFAULT_KEYMAP}'"
104		import_resource cfg_input "${serial}" keymap "${MCORE_DEFAULT_KEYMAP}"
105		fi
106
107		# now setup some empty database entries if the does not exist
108		for i in user root vnc
109		do
110		auth=$(mysqldo "select ${i} from client_auth where serial=${serial};")
111		if [[ -z ${auth} ]] || [[ ${auth} = NULL ]]
112		then
113		decho "set empty ${i} pass"
114		import_resource client_auth "${serial}" "${i}" ""
115		fi
116		done
117
118		# create an empty screensaver entry
119		decho "set empty screensaver"
120		import_resource cfg_screensaver "${serial}" "screensaver" ""
121
122		# enable vnc service
123		decho "enable vnc service"
124		import_resource cfg_vnc "${serial}" "service" "1"
125
126	# update the hwdetected flags	# update the hwdetected flags
127	import_resource client_serial "${serial}" hwdetected 1	import_resource client_serials "${serial}" hwdetected 1
128		}
129
130		set_hardware_detect()
131		{
132		local serial="${CLASS_ARGV[0]}"
133
134		local cmd
135		local netcard_driver
136		local networking
137		local hostname
138		local domain
139		local graphic_driver
140		local monitor_info
141		local monitor_resolution
142		local hwdetected
143
144		if [[ -z ${serial} ]]
145		then
146		eecho "No serial given"
147		return 1
148		fi
149
150		run_hardware_detect "${serial}"
151	}	}

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.2498   changed lines   Added in v.2618