--- alx-src/trunk/alx-web/show.php 2008/06/04 23:28:35 433 +++ alx-src/trunk/alx-web/show.php 2008/06/04 23:32:57 435 @@ -26,7 +26,7 @@ $drop['resolution'] = array('640x480', '800x600', '1024x768', '1280x1024','1360x768', '1366x768', '1600x1200'); $drop['depth'] = array('24', '16', '8'); $drop['mouse'] = array('Auto', 'IMPS/2', 'PS/2'); - $drop['cfg_network_module'] = array('3c59x', '8139too', '8139cp', 'e100', 'ne2k-pci', 'pcnet32', 'sis900', 'via-rhine', 'zd1211'); + $drop['cfg_network_module'] = array('auto','3c59x', '8139too', '8139cp', 'e100', 'ne2k-pci', 'pcnet32', 'sis900', 'via-rhine', 'zd1211'); $drop['networking'] = array('dhcp', 'static'); $drop['port'] = array('lpt1', 'com1', 'com2', 'lpd', 'socket', 'ipp'); $drop['location'] = sqlarr('SELECT location FROM client_locations', '', 'location'); @@ -345,7 +345,7 @@ fwrite($hostfile,$conn['ip']." ".$row[0],strlen($row[0])+strlen($conn['ip'])+1); fclose($hostfile); - $osver = exec($sshcmd.' -l root '.$conn['ip'].' \'os_ver=$(<'$mageversion.');cfg_ver=$(/sbin/magequery -n '.$alxconfig.'|cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"\''); + $osver = exec($sshcmd.' -l root '.$conn['ip'].' \'os_ver=$(<'.$mageversion.');cfg_ver=$(/sbin/magequery -n '.$alxconfig.'|cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"\''); $osver = explode(':',$osver); } if($osver[0] == '') $osver[0]='unkown';