Author: lslezak Date: Wed Mar 31 16:38:36 2010 New Revision: 61548 URL: http://svn.opensuse.org/viewcvs/yast?rev=61548&view=rev Log: - put the Linuxrc CD/DVD device to the beginning of the CD/DVD device list - prefer the Linuxrc medium (bnc#588810) - 2.17.72 Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/modules/InstURL.ycp Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packag... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Wed Mar 31 16:38:36 2010 @@ -1 +1 @@ -2.17.71 +2.17.72 Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packag... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Wed Mar 31 16:38:36 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 31 14:35:48 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#588810) +- 2.17.72 + +------------------------------------------------------------------- Tue Mar 2 10:52:12 CET 2010 - ug@suse.de - ayast_setup post-patterns did not work (bnc#584564) Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/InstURL.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packag... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/InstURL.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/InstURL.ycp Wed Mar 31 16:38:36 2010 @@ -56,6 +56,27 @@ if (size (ready) != 0) devlist = ready; + + // add the Linuxrc medium to the beginning + string repo_url = Linuxrc::InstallInf("RepoURL"); + if (regexpmatch(tolower(repo_url), "^cd:") || regexpmatch(tolower(repo_url), "^dvd:")) + { + y2milestone("Found CD/DVD device in Linuxrc RepoURL: %1", repo_url); + string linuxrc_device = regexpsub(repo_url, "device=(.*)$", "\1"); + if (linuxrc_device != nil && linuxrc_device != "") + { + linuxrc_device = "/dev/" + linuxrc_device; + 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