Author: ug Date: Wed Dec 23 11:34:24 2009 New Revision: 60190 URL: http://svn.opensuse.org/viewcvs/yast?rev=60190&view=rev Log: merged autoyast=device and autoyast=usb (bnc#565558) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/include/io.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=60190&r1=60189&r2=60190&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Dec 23 11:34:24 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 23 11:30:12 CET 2009 - ug@suse.de + +- merged the code for autoyast=device and autoyast=usb to reduce + redundancy and fix the "already mounted" bug for USB (bnc#565558) + +------------------------------------------------------------------- Wed Dec 16 18:44:20 CET 2009 - aschnell@suse.de - adapted encryption password setting to new yast2-storage Modified: trunk/autoinstallation/src/include/io.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/io.ycp?rev=60190&r1=60189&r2=60190&view=diff ============================================================================== --- trunk/autoinstallation/src/include/io.ycp (original) +++ trunk/autoinstallation/src/include/io.ycp Wed Dec 23 11:34:24 2009 @@ -238,7 +238,8 @@ WFM::Execute(.local.umount, mount_point); } - else if (Scheme == "floppy" || Scheme == "usb") +// else if (Scheme == "floppy" || Scheme == "usb") + else if (Scheme == "floppy") { if (StorageDevices::FloppyReady() && Scheme == "floppy") { @@ -254,6 +255,8 @@ ok = true; } SCR::Execute(.target.umount, mount_point); + } + /* } else { y2milestone("looking for %1 on USB", Path); list<map> probe = (list<map>)SCR::Read(.probe.usb); @@ -286,15 +289,19 @@ break; }); } + */ } - else if (Scheme == "device") // Device + else if (Scheme == "device" || Scheme == "usb" ) // Device or USB { if ( Path != "") { list<string> deviceList = []; if( Host == "" ) { - list<map> disks = (list<map>)SCR::Read(.probe.disk); + list<map> disks = (Scheme == "device") ? (list<map>)SCR::Read(.probe.disk) : (list<map>)SCR::Read(.probe.usb); foreach( map m, disks, ``{ + if( Scheme == "usb" && + m["bus"]:"USB" != "SCSI" ) + continue; if( haskey( m, "dev_name") ) { integer i = 0; string dev = m["dev_name"]:""; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org