Author: jsrain Date: Thu Nov 25 10:27:43 2010 New Revision: 62888 URL: http://svn.opensuse.org/viewcvs/yast?rev=62888&view=rev Log: fixed detection of virtio devices (bnc#649755) Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packager/VERSION?rev=62888&r1=62887&r2=62888&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/VERSION Thu Nov 25 10:27:43 2010 @@ -1 +1 @@ -2.13.192 +2.13.193 Modified: branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes?rev=62888&r1=62887&r2=62888&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes Thu Nov 25 10:27:43 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 25 10:18:19 CET 2010 - jsrain@suse.cz + +- fixed detection of virtio devices (bnc#649755) +- 2.13.193 + +------------------------------------------------------------------- Fri Nov 12 15:30:17 UTC 2010 - lslezak@suse.cz - source manager - changed "Local Directory" radio button label Modified: branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp?rev=62888&r1=62887&r2=62888&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Thu Nov 25 10:27:43 2010 @@ -93,11 +93,12 @@ map out = (map)SCR::Execute (.target.bash_output, "LANG=C /sbin/lspci -mm -n"); list<string> devices = splitstring (out["stdout"]:"", "\n"); foreach (string d, devices, { - if (! regexpmatch (d, "^[0-9a-zA-Z.:]+[ \t]+\"[0-9a-fA-F]+\"[ \t]+\"[0-9a-fA-F]+\".*$")) { + // note: in case of porting to SLES11 or newer code base, adapting to changed lspci output is needed + if (! regexpmatch (d, "^[0-9a-zA-Z.:]+[ \t]+\"Class [0-9a-fA-F]+\"[ \t]+\"[0-9a-fA-F]+\"[ \t]+\"[0-9a-fA-F]+\".*$")) { continue; } - string vendor = regexpsub (d, "^[0-9a-zA-Z.:]+[ \t]+\"([0-9a-fA-F]+)\"[ \t]+\"([0-9a-fA-F]+)\".*$", "\\2"); - string device = regexpsub (d, "^[0-9a-zA-Z.:]+[ \t]+\"([0-9a-fA-F]+)\"[ \t]+\"([0-9a-fA-F]+)\".*$", "\\1"); + string vendor = regexpsub (d, "^[0-9a-zA-Z.:]+[ \t]+\"Class [0-9a-fA-F]+\"[ \t]+\"([0-9a-fA-F]+)\"[ \t]+\"([0-9a-fA-F]+)\".*$", "\\1"); + string device = regexpsub (d, "^[0-9a-zA-Z.:]+[ \t]+\"Class [0-9a-fA-F]+\"[ \t]+\"([0-9a-fA-F]+)\"[ \t]+\"([0-9a-fA-F]+)\".*$", "\\2"); foreach (string m, modules_db[vendor, device]:[], { Initrd::AddModule (m, ""); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org