Author: ug Date: Tue Jan 5 10:34:14 2010 New Revision: 60230 URL: http://svn.opensuse.org/viewcvs/yast?rev=60230&view=rev Log: better mounting for usb:// and device:// Modified: trunk/autoinstallation/src/include/io.ycp Modified: trunk/autoinstallation/src/include/io.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/io.ycp?rev=60230&r1=60229&r2=60230&view=diff ============================================================================== --- trunk/autoinstallation/src/include/io.ycp (original) +++ trunk/autoinstallation/src/include/io.ycp Tue Jan 5 10:34:14 2010 @@ -305,6 +305,7 @@ if( haskey( m, "dev_name") ) { integer i = 0; string dev = m["dev_name"]:""; + deviceList = add( deviceList, substring( dev, 5 ) ); // not uncommon for USB sticks to have no partition do { i = i + 1; dev = m["dev_name"]:"" + sformat("%1",i); @@ -346,9 +347,13 @@ } }); y2milestone("already mounted=%1 mountpoint=%2",already_mounted,mount_point); - if( ! already_mounted ) - WFM::Execute(.local.mount, [sformat("/dev/%1", Host) , - mount_point]); + if( ! already_mounted && + !(boolean)WFM::Execute(.local.mount, [sformat("/dev/%1", Host), + mount_point]) ) { + y2milestone("%1 is not mounted and mount failed", sformat("/dev/%1", Host)); + GET_error = sformat(_("%1 is not mounted and mount failed"), sformat("/dev/%1", Host)); + continue; + } if (WFM::Execute (.local.bash, "/bin/cp " + mount_point + "/" + Path + " " + Localfile) != 0 ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org