--- alx-src/branches/alxconf_20060908/init.d/alxsettings 2009/02/04 20:07:30 545 +++ alx-src/branches/alxconf_20060908/init.d/alxsettings 2010/11/23 12:24:14 1582 @@ -37,6 +37,7 @@ source /usr/lib/alxconfig-ng/functions/config_x11 source /usr/lib/alxconfig-ng/functions/config_auth source /usr/lib/alxconfig-ng/functions/config_ssh_auth +source /usr/lib/alxconfig-ng/functions/config_versions # check if mysql is available [ -x /usr/bin/mysql ] && MYSQL_ALX=true @@ -93,6 +94,9 @@ # exchange ssh rsa keys HOME=/root config_ssh_auth + + # import version info + config_version } get_system_serial() @@ -377,14 +381,14 @@ module, resolution, depth, - monitorid + refresh_rate ) values( '${ALX_SERIAL}', '${XMODULE}', '1024x768', '16', - '0' + '60' );"; ) evaluate_retval @@ -427,6 +431,14 @@ echo -e " Screensaver settings ..." mysqldo "insert into cfg_screensaver(serial,screensaver) values('${ALX_SERIAL}','')" + # version info + local alx_os + local alx_utils + alx_os="$(< /etc/mageversion)" + alx_utils="$(magequery -n alxconfig-ng-alx | sed 's:.*\[\ \(.*\)\ \].*:\1:')" + alx_utils="${alx_utils/alxconfig-ng-alx-}" + mysqldo "insert into client_version(serial,os,utils) values('${ALX_SERIAL}','${alx_os}','${alx_utils}')" + evaluate_retval } @@ -509,7 +521,7 @@ module='${XMODULE}', resolution='1024x768', depth='16', - monitorid='0' + refresh_rate='60' where serial=${ALX_SERIAL};" evaluate_retval @@ -517,6 +529,14 @@ echo -e " Input settings ..." mysqldo "update cfg_input set mouse='${XMOUSETYPE}' where serial=${ALX_SERIAL};" evaluate_retval + + # version info + local alx_os + local alx_utils + alx_os="$(< /etc/mageversion)" + alx_utils="$(magequery -n alxconfig-ng-alx | sed 's:.*\[\ \(.*\)\ \].*:\1:')" + alx_utils="${alx_utils/alxconfig-ng-alx-}" + mysqldo "update client_version set os='${alx_os}', utils='${alx_utils}' where serial=${ALX_SERIAL};" } # imports current settings to the local system resolved by the hardware detection