Diff of /alx-src/branches/alxconf_20060908/init.d/alxsettings

Parent Directory | Revision Log | Patch

	revision 1581 by niro, Wed Feb 4 20:07:30 2009 UTC	revision 1582 by niro, Tue Nov 23 12:24:14 2010 UTC
#	Line 37  source /usr/lib/alxconfig-ng/functions/c	Line 37  source /usr/lib/alxconfig-ng/functions/c
37	source /usr/lib/alxconfig-ng/functions/config_x11	source /usr/lib/alxconfig-ng/functions/config_x11
38	source /usr/lib/alxconfig-ng/functions/config_auth	source /usr/lib/alxconfig-ng/functions/config_auth
39	source /usr/lib/alxconfig-ng/functions/config_ssh_auth	source /usr/lib/alxconfig-ng/functions/config_ssh_auth
40		source /usr/lib/alxconfig-ng/functions/config_versions
41
42	# check if mysql is available	# check if mysql is available
43	[ -x /usr/bin/mysql ] && MYSQL_ALX=true	[ -x /usr/bin/mysql ] && MYSQL_ALX=true
#	Line 93  update_system_settings()	Line 94  update_system_settings()
94
95	# exchange ssh rsa keys	# exchange ssh rsa keys
96	HOME=/root config_ssh_auth	HOME=/root config_ssh_auth
97
98		# import version info
99		config_version
100	}	}
101
102	get_system_serial()	get_system_serial()
#	Line 377  import_settings_to_db()	Line 381  import_settings_to_db()
381	module,	module,
382	resolution,	resolution,
383	depth,	depth,
384	monitorid	refresh_rate
385	)	)
386	values(	values(
387	'${ALX_SERIAL}',	'${ALX_SERIAL}',
388	'${XMODULE}',	'${XMODULE}',
389	'1024x768',	'1024x768',
390	'16',	'16',
391	'0'	'60'
392	);"; )	);"; )
393	evaluate_retval	evaluate_retval
394
#	Line 427  import_settings_to_db()	Line 431  import_settings_to_db()
431	echo -e "      Screensaver settings ..."	echo -e "      Screensaver settings ..."
432	mysqldo "insert into cfg_screensaver(serial,screensaver) values('${ALX_SERIAL}','')"	mysqldo "insert into cfg_screensaver(serial,screensaver) values('${ALX_SERIAL}','')"
433
434		# version info
435		local alx_os
436		local alx_utils
437		alx_os="$(< /etc/mageversion)"
438		alx_utils="$(magequery -n alxconfig-ng-alx | sed 's:.*\[\ \(.*\)\ \].*:\1:')"
439		alx_utils="${alx_utils/alxconfig-ng-alx-}"
440		mysqldo "insert into client_version(serial,os,utils) values('${ALX_SERIAL}','${alx_os}','${alx_utils}')"
441
442	evaluate_retval	evaluate_retval
443	}	}
444
#	Line 509  update_settings_in_db()	Line 521  update_settings_in_db()
521	module='${XMODULE}',	module='${XMODULE}',
522	resolution='1024x768',	resolution='1024x768',
523	depth='16',	depth='16',
524	monitorid='0'	refresh_rate='60'
525	where serial=${ALX_SERIAL};"	where serial=${ALX_SERIAL};"
526	evaluate_retval	evaluate_retval
527
#	Line 517  update_settings_in_db()	Line 529  update_settings_in_db()
529	echo -e "      Input settings ..."	echo -e "      Input settings ..."
530	mysqldo "update cfg_input set mouse='${XMOUSETYPE}' where serial=${ALX_SERIAL};"	mysqldo "update cfg_input set mouse='${XMOUSETYPE}' where serial=${ALX_SERIAL};"
531	evaluate_retval	evaluate_retval
532
533		# version info
534		local alx_os
535		local alx_utils
536		alx_os="$(< /etc/mageversion)"
537		alx_utils="$(magequery -n alxconfig-ng-alx | sed 's:.*\[\ \(.*\)\ \].*:\1:')"
538		alx_utils="${alx_utils/alxconfig-ng-alx-}"
539		mysqldo "update client_version set os='${alx_os}', utils='${alx_utils}' where serial=${ALX_SERIAL};"
540	}	}
541
542	# imports current settings to the local system resolved by the hardware detection	# imports current settings to the local system resolved by the hardware detection

---

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

Legend: Removed from v.1581   changed lines   Added in v.1582