Author: lslezak Date: Wed Oct 6 20:08:16 2010 New Revision: 62549 URL: http://svn.opensuse.org/viewcvs/yast?rev=62549&view=rev Log: - put the Linuxrc CD/DVD device to the beginning of the CD/DVD device list - prefer the Linuxrc medium (bnc#588830) - 2.13.186 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/modules/InstURL.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=62549&r1=62548&r2=62549&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/VERSION Wed Oct 6 20:08:16 2010 @@ -1 +1 @@ -2.13.185 +2.13.186 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=62549&r1=62548&r2=62549&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 Wed Oct 6 20:08:16 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 6 17:48:40 UTC 2010 - lslezak@suse.cz + +- put the Linuxrc CD/DVD device to the beginning of the CD/DVD + device list - prefer the Linuxrc medium (bnc#588830) +- 2.13.186 + +------------------------------------------------------------------- Fri Jul 24 08:43:26 CEST 2009 - lslezak@suse.cz - fixed URL password logging into y2log (bnc#441944) Modified: branches/SuSE-SLE-10-SP4-Branch/packager/src/modules/InstURL.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packager/src/modules/InstURL.ycp?rev=62549&r1=62548&r2=62549&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/src/modules/InstURL.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/src/modules/InstURL.ycp Wed Oct 6 20:08:16 2010 @@ -58,6 +58,24 @@ if (size (ready) != 0) devlist = ready; + + // add the Linuxrc medium to the beginning + string cdrom = Linuxrc::InstallInf("Cdrom"); + if (cdrom != nil && cdrom != "") + { + y2milestone("Found CD/DVD device in /etc/install.inf: %1", cdrom); + string linuxrc_device = "/dev/" + cdrom; + y2milestone("Using Linuxrc device: %1", linuxrc_device); + + // remove the device if it is already in the list + devlist = filter(string d, devlist, {return d != linuxrc_device;}); + + // put the linuxrc device at the beginning + devlist = prepend(devlist, linuxrc_device); + + y2milestone("Using CD/DVD device list: %1", devlist); + } + foreach (string d, devlist, { if (d != "") { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org