October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41382 - in /trunk/installation: package/yast2-installation.changes src/clients/release_notes_popup.ycp
by jsrain＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: jsrain Date: Thu Oct 11 15:25:35 2007 New Revision: 41382 URL: http://svn.opensuse.org/viewcvs/yast?rev=41382&view=rev Log: show release notes properly in live installation (#332862) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/release_notes_popup.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Oct 11 15:25:35 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Oct 11 15:00:03 CEST 2007 - jsrain(a)suse.cz + +- show release notes properly in live installation (#332862) + +------------------------------------------------------------------- Wed Oct 3 17:50:11 CEST 2007 - locilka(a)suse.cz - Added "Network Type" information to the First Stage Network Setup Modified: trunk/installation/src/clients/release_notes_popup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/release… ============================================================================== --- trunk/installation/src/clients/release_notes_popup.ycp (original) +++ trunk/installation/src/clients/release_notes_popup.ycp Thu Oct 11 15:25:35 2007 @@ -17,6 +17,7 @@ import "Label"; import "Stage"; import "Packages"; + import "Mode"; /* filename of release notes */ string file = ""; @@ -67,9 +68,42 @@ return false; }; + // in live installation, the release notes are in the /usr/doc directory, find right file there (bug 332862) + define boolean find_release_notes () + { + y2milestone ("Finding release notes in local filesystem"); + // FIXME hardcoded product name + string path_to_relnotes = "/usr/share/doc/release-notes/openSUSE/"; + string path_templ = path_to_relnotes + "/RELEASE-NOTES.%1.rtf"; + y2debug ("Path template: %1", path_templ); + string tmp = sformat (path_templ, Language::language); + y2debug ("Trying to get %1", tmp); + if (0 >= (integer)SCR::Read (.target.size, tmp)) + { + tmp = sformat (path_templ, substring (Language::language, 0, 2)); + y2debug ("Trying to get %1", tmp); + } + if (0 >= (integer)SCR::Read (.target.size, tmp)) + { + tmp = sformat (path_templ, "en"); + y2debug ("Trying to get %1", tmp); + } + if (0 >= (integer)SCR::Read (.target.size, tmp)) + return false; + + y2milestone ("Reading file %1", tmp); + text = (string)SCR::Read (.target.string, [tmp, ""]); + if (text != "" && text != nil) + return true; + return false; + } + y2milestone ("Calling: Release Notes Popup"); - if (! load_release_notes ()) + if (! (Mode::live_installation () + ? find_release_notes () + : load_release_notes () + )) { // error report Report::Error (_("Cannot load release notes.")); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41381 - in /branches/SuSE-Linux-10_3-Branch/installation: VERSION package/yast2-installation.changes src/clients/release_notes_popup.ycp
by jsrain＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: jsrain Date: Thu Oct 11 15:24:35 2007 New Revision: 41381 URL: http://svn.opensuse.org/viewcvs/yast?rev=41381&view=rev Log: show release notes properly in live installation (#332862) Modified: branches/SuSE-Linux-10_3-Branch/installation/VERSION branches/SuSE-Linux-10_3-Branch/installation/package/yast2-installation.changes branches/SuSE-Linux-10_3-Branch/installation/src/clients/release_notes_popup.ycp Modified: branches/SuSE-Linux-10_3-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/instal… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/installation/VERSION (original) +++ branches/SuSE-Linux-10_3-Branch/installation/VERSION Thu Oct 11 15:24:35 2007 @@ -1 +1 @@ -2.15.54 +2.15.55 Modified: branches/SuSE-Linux-10_3-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/instal… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Linux-10_3-Branch/installation/package/yast2-installation.changes Thu Oct 11 15:24:35 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 11 15:00:03 CEST 2007 - jsrain(a)suse.cz + +- show release notes properly in live installation (#332862) +- 2.15.55 + +------------------------------------------------------------------- Mon Sep 24 16:43:11 CEST 2007 - locilka(a)suse.cz - Changed default delete_old_packages back to 'true' after finding Modified: branches/SuSE-Linux-10_3-Branch/installation/src/clients/release_notes_popup.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/instal… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/installation/src/clients/release_notes_popup.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/installation/src/clients/release_notes_popup.ycp Thu Oct 11 15:24:35 2007 @@ -17,6 +17,7 @@ import "Label"; import "Stage"; import "Packages"; + import "Mode"; /* filename of release notes */ string file = ""; @@ -67,9 +68,42 @@ return false; }; + // in live installation, the release notes are in the /usr/doc directory, find right file there (bug 332862) + define boolean find_release_notes () + { + y2milestone ("Finding release notes in local filesystem"); + // FIXME hardcoded product name + string path_to_relnotes = "/usr/share/doc/release-notes/openSUSE/"; + string path_templ = path_to_relnotes + "/RELEASE-NOTES.%1.rtf"; + y2debug ("Path template: %1", path_templ); + string tmp = sformat (path_templ, Language::language); + y2debug ("Trying to get %1", tmp); + if (0 >= (integer)SCR::Read (.target.size, tmp)) + { + tmp = sformat (path_templ, substring (Language::language, 0, 2)); + y2debug ("Trying to get %1", tmp); + } + if (0 >= (integer)SCR::Read (.target.size, tmp)) + { + tmp = sformat (path_templ, "en"); + y2debug ("Trying to get %1", tmp); + } + if (0 >= (integer)SCR::Read (.target.size, tmp)) + return false; + + y2milestone ("Reading file %1", tmp); + text = (string)SCR::Read (.target.string, [tmp, ""]); + if (text != "" && text != nil) + return true; + return false; + } + y2milestone ("Calling: Release Notes Popup"); - if (! load_release_notes ()) + if (! (Mode::live_installation () + ? find_release_notes () + : load_release_notes () + )) { // error report Report::Error (_("Cannot load release notes.")); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41380 - /tags/stable-2_16_1/bootloader/
by odabrunz＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: odabrunz Date: Thu Oct 11 15:23:29 2007 New Revision: 41380 URL: http://svn.opensuse.org/viewcvs/yast?rev=41380&view=rev Log: Created tag stable-2_16_1 for bootloader Added: tags/stable-2_16_1/bootloader/ - copied from r41379, trunk/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41379 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes
by odabrunz＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: odabrunz Date: Thu Oct 11 15:23:13 2007 New Revision: 41379 URL: http://svn.opensuse.org/viewcvs/yast?rev=41379&view=rev Log: - corrected version and changes file - 2.16.1 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=41379&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Thu Oct 11 15:23:13 2007 @@ -1 +1 @@ -2.15.30 +2.16.1 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Thu Oct 11 15:23:13 2007 @@ -1,9 +1,9 @@ ------------------------------------------------------------------- -Thu Oct 11 15:18:58 CEST 2007 - od(a)suse.de +Thu Oct 11 15:22:27 CEST 2007 - od(a)suse.de - migrate SLES9 persistent device ("...p1") names to SLES10 persistent device names ("...-part1") (#162216) -- 2.15.30 +- 2.16.1 ------------------------------------------------------------------- Wed Sep 26 21:22:58 CEST 2007 - od(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41378 - /tags/stable-2_15_30/bootloader/
by odabrunz＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: odabrunz Date: Thu Oct 11 15:20:39 2007 New Revision: 41378 URL: http://svn.opensuse.org/viewcvs/yast?rev=41378&view=rev Log: Created tag stable-2_15_30 for bootloader Added: tags/stable-2_15_30/bootloader/ - copied from r41377, trunk/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41377 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes
by odabrunz＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: odabrunz Date: Thu Oct 11 15:20:27 2007 New Revision: 41377 URL: http://svn.opensuse.org/viewcvs/yast?rev=41377&view=rev Log: - updated changes file - 2.15.30 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=41377&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Thu Oct 11 15:20:27 2007 @@ -1 +1 @@ -2.15.29 +2.15.30 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Thu Oct 11 15:20:27 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 11 15:18:58 CEST 2007 - od(a)suse.de + +- migrate SLES9 persistent device ("...p1") names to SLES10 + persistent device names ("...-part1") (#162216) +- 2.15.30 + +------------------------------------------------------------------- Wed Sep 26 21:22:58 CEST 2007 - od(a)suse.de - added flag avoid_reading_device_map to blRead(), all internal -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41376 - /trunk/bootloader/y2_checkin.state
by odabrunz＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: odabrunz Date: Thu Oct 11 15:18:39 2007 New Revision: 41376 URL: http://svn.opensuse.org/viewcvs/yast?rev=41376&view=rev Log: - updated merge state file Modified: trunk/bootloader/y2_checkin.state Modified: trunk/bootloader/y2_checkin.state URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/y2_checkin.state?rev=… ============================================================================== --- trunk/bootloader/y2_checkin.state (original) +++ trunk/bootloader/y2_checkin.state Thu Oct 11 15:18:39 2007 @@ -6,9 +6,9 @@ http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_0-Branch/bootloader 26031 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_1-Branch/bootloader 30669 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_2-Branch/bootloader 34622 -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_3-Branch/bootloader 41092 +http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_3-Branch/bootloader 41125 http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP1-Branch/bootloader 37794 -http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader 41083 +http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader 41157 # revisions seen: # @@ -16,9 +16,9 @@ http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_0-Branch/bootloader 25537 25727 26031 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_1-Branch/bootloader 30669 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_2-Branch/bootloader 34622 -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_3-Branch/bootloader 41091 41092 +http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_3-Branch/bootloader 41091 41092 41125 http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP1-Branch/bootloader 31627 31731 33390 34876 35236 35340 35342 35344 35347 35356 35413 35417 35650 35829 35850 35916 35917 35999 36005 36006 36027 36059 36143 36175 36768 36888 36889 36890 36900 36960 36961 36964 37091 37172 37196 37377 37430 37448 37451 37616 37672 37673 37674 37675 37676 37677 37678 37761 37762 37794 -http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader +http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader 41157 # revisions postponed: # @@ -32,82 +32,84 @@ # source: # merge states of the revisions -MERGE_STATE[21937]=not_merged -MERGE_STATE[21967]=not_merged -MERGE_STATE[22006]=not_merged -MERGE_STATE[22037]=not_merged -MERGE_STATE[22040]=not_merged -MERGE_STATE[22055]=not_merged -MERGE_STATE[22100]=not_merged -MERGE_STATE[22113]=not_merged -MERGE_STATE[22239]=not_merged -MERGE_STATE[22285]=not_merged -MERGE_STATE[22312]=not_merged -MERGE_STATE[22318]=not_merged -MERGE_STATE[22488]=not_merged -MERGE_STATE[22587]=not_merged -MERGE_STATE[25537]=not_merged -MERGE_STATE[25727]=not_merged -MERGE_STATE[26031]=not_merged -MERGE_STATE[30669]=not_merged -MERGE_STATE[31508]=not_merged -MERGE_STATE[31536]=not_merged -MERGE_STATE[31598]=not_merged -MERGE_STATE[31627]=already_merged -MERGE_STATE[31728]=not_merged -MERGE_STATE[31731]=already_merged -MERGE_STATE[31732]=not_merged -MERGE_STATE[33390]=already_merged -MERGE_STATE[34622]=not_merged -MERGE_STATE[34876]=already_merged -MERGE_STATE[35236]=already_merged -MERGE_STATE[35340]=already_merged -MERGE_STATE[35342]=already_merged -MERGE_STATE[35344]=already_merged -MERGE_STATE[35347]=already_merged -MERGE_STATE[35356]=already_merged -MERGE_STATE[35413]=already_merged -MERGE_STATE[35417]=already_merged -MERGE_STATE[35650]=merged -MERGE_STATE[35829]=already_merged -MERGE_STATE[35850]=already_merged -MERGE_STATE[35916]=merged -MERGE_STATE[35917]=already_merged -MERGE_STATE[35999]=merged -MERGE_STATE[36005]=already_merged -MERGE_STATE[36006]=already_merged -MERGE_STATE[36027]=merged -MERGE_STATE[36059]=merged -MERGE_STATE[36143]=already_merged -MERGE_STATE[36175]=already_merged -MERGE_STATE[36768]=already_merged -MERGE_STATE[36888]=merged -MERGE_STATE[36889]=merged -MERGE_STATE[36890]=merged -MERGE_STATE[36900]=merged -MERGE_STATE[36960]=merged -MERGE_STATE[36961]=merged -MERGE_STATE[36964]=merged -MERGE_STATE[37091]=merged -MERGE_STATE[37172]=merged -MERGE_STATE[37196]=merged -MERGE_STATE[37377]=already_merged -MERGE_STATE[37430]=merged -MERGE_STATE[37448]=merged -MERGE_STATE[37451]=merged -MERGE_STATE[37616]=merged -MERGE_STATE[37672]=merged -MERGE_STATE[37673]=merged -MERGE_STATE[37674]=merged -MERGE_STATE[37675]=merged -MERGE_STATE[37676]=merged -MERGE_STATE[37677]=merged -MERGE_STATE[37678]=merged -MERGE_STATE[37761]=merged -MERGE_STATE[37762]=merged -MERGE_STATE[37794]=merged -MERGE_STATE[41091]=not_merged -MERGE_STATE[41092]=not_merged +MERGE_STATE[21937]='not_merged' +MERGE_STATE[21967]='not_merged' +MERGE_STATE[22006]='not_merged' +MERGE_STATE[22037]='not_merged' +MERGE_STATE[22040]='not_merged' +MERGE_STATE[22055]='not_merged' +MERGE_STATE[22100]='not_merged' +MERGE_STATE[22113]='not_merged' +MERGE_STATE[22239]='not_merged' +MERGE_STATE[22285]='not_merged' +MERGE_STATE[22312]='not_merged' +MERGE_STATE[22318]='not_merged' +MERGE_STATE[22488]='not_merged' +MERGE_STATE[22587]='not_merged' +MERGE_STATE[25537]='not_merged' +MERGE_STATE[25727]='not_merged' +MERGE_STATE[26031]='not_merged' +MERGE_STATE[30669]='not_merged' +MERGE_STATE[31508]='not_merged' +MERGE_STATE[31536]='not_merged' +MERGE_STATE[31598]='not_merged' +MERGE_STATE[31627]='already_merged' +MERGE_STATE[31728]='not_merged' +MERGE_STATE[31731]='already_merged' +MERGE_STATE[31732]='not_merged' +MERGE_STATE[33390]='already_merged' +MERGE_STATE[34622]='not_merged' +MERGE_STATE[34876]='already_merged' +MERGE_STATE[35236]='already_merged' +MERGE_STATE[35340]='already_merged' +MERGE_STATE[35342]='already_merged' +MERGE_STATE[35344]='already_merged' +MERGE_STATE[35347]='already_merged' +MERGE_STATE[35356]='already_merged' +MERGE_STATE[35413]='already_merged' +MERGE_STATE[35417]='already_merged' +MERGE_STATE[35650]='merged' +MERGE_STATE[35829]='already_merged' +MERGE_STATE[35850]='already_merged' +MERGE_STATE[35916]='merged' +MERGE_STATE[35917]='already_merged' +MERGE_STATE[35999]='merged' +MERGE_STATE[36005]='already_merged' +MERGE_STATE[36006]='already_merged' +MERGE_STATE[36027]='merged' +MERGE_STATE[36059]='merged' +MERGE_STATE[36143]='already_merged' +MERGE_STATE[36175]='already_merged' +MERGE_STATE[36768]='already_merged' +MERGE_STATE[36888]='merged' +MERGE_STATE[36889]='merged' +MERGE_STATE[36890]='merged' +MERGE_STATE[36900]='merged' +MERGE_STATE[36960]='merged' +MERGE_STATE[36961]='merged' +MERGE_STATE[36964]='merged' +MERGE_STATE[37091]='merged' +MERGE_STATE[37172]='merged' +MERGE_STATE[37196]='merged' +MERGE_STATE[37377]='already_merged' +MERGE_STATE[37430]='merged' +MERGE_STATE[37448]='merged' +MERGE_STATE[37451]='merged' +MERGE_STATE[37616]='merged' +MERGE_STATE[37672]='merged' +MERGE_STATE[37673]='merged' +MERGE_STATE[37674]='merged' +MERGE_STATE[37675]='merged' +MERGE_STATE[37676]='merged' +MERGE_STATE[37677]='merged' +MERGE_STATE[37678]='merged' +MERGE_STATE[37761]='merged' +MERGE_STATE[37762]='merged' +MERGE_STATE[37794]='merged' +MERGE_STATE[41091]='not_merged' +MERGE_STATE[41092]='not_merged' +MERGE_STATE[41125]='not_merged' +MERGE_STATE[41157]='already_merged' # comments for postponed / not merged revisions REV_COMMENT[41091]='This is change #41092 on branch http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_3-Branch/bootloader. @@ -152,3 +154,5 @@ These changes are not merged to branch http://svn.opensuse.org/svn/yast/trunk/bootloader, because - they were previously merged from the current branch' +REV_COMMENT[41125]=' - these were previously merged from the current branch' + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41375 - /tags/branch-SLE-10-SP1-2_13_95/storage/
by fehr＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: fehr Date: Thu Oct 11 14:59:56 2007 New Revision: 41375 URL: http://svn.opensuse.org/viewcvs/yast?rev=41375&view=rev Log: Created tag branch-SLE-10-SP1-2_13_95 for storage Added: tags/branch-SLE-10-SP1-2_13_95/storage/ - copied from r41374, branches/SuSE-SLE-10-SP1-Branch/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41374 - /trunk/yast2/library/modules/FileUtils.ycp
by locilka＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: locilka Date: Thu Oct 11 14:58:33 2007 New Revision: 41374 URL: http://svn.opensuse.org/viewcvs/yast?rev=41374&view=rev Log: MD5Sum should really return something :) Modified: trunk/yast2/library/modules/FileUtils.ycp Modified: trunk/yast2/library/modules/FileUtils.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/FileUtils.… ============================================================================== --- trunk/yast2/library/modules/FileUtils.ycp (original) +++ trunk/yast2/library/modules/FileUtils.ycp Thu Oct 11 14:58:33 2007 @@ -357,8 +357,6 @@ return nil; } - string ret = ""; - string cmd = sformat ("md5sum '%1'", String::Quote (target)); map cmd_out = (map) SCR::Execute (.target.bash_output, cmd); @@ -375,6 +373,8 @@ y2warning ("Strange md5out: '%1'", filemd5); return nil; } + + return filemd5; } /* EOF */ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41373 - in /trunk/bootloader/src: clients/ elilo/ generic/ modules/ routines/
by odabrunz＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: odabrunz Date: Thu Oct 11 14:55:01 2007 New Revision: 41373 URL: http://svn.opensuse.org/viewcvs/yast?rev=41373&view=rev Log: - migrate SLES9 persistent device ("...p1") names to SLES10 persistent device names ("...-part1") (#162216) - add author where missing Modified: trunk/bootloader/src/clients/bootloader_finish.ycp trunk/bootloader/src/elilo/helps.ycp trunk/bootloader/src/generic/dialogs.ycp trunk/bootloader/src/modules/BootArch.ycp trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/BootELILO.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/modules/BootLILO.ycp trunk/bootloader/src/modules/Bootloader.ycp trunk/bootloader/src/routines/autoinstall.ycp trunk/bootloader/src/routines/lilolike.ycp trunk/bootloader/src/routines/popups.ycp trunk/bootloader/src/routines/section_widgets.ycp trunk/bootloader/src/routines/switcher.ycp Modified: trunk/bootloader/src/clients/bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloade… ============================================================================== --- trunk/bootloader/src/clients/bootloader_finish.ycp (original) +++ trunk/bootloader/src/clients/bootloader_finish.ycp Thu Oct 11 14:55:01 2007 @@ -7,6 +7,7 @@ * * Authors: * Jiri Srain <jsrain(a)suse.cz> + * Olaf Dabrunz <od(a)suse.de> * * $Id$ * Modified: trunk/bootloader/src/elilo/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/elilo/helps.ycp?r… ============================================================================== --- trunk/bootloader/src/elilo/helps.ycp (original) +++ trunk/bootloader/src/elilo/helps.ycp Thu Oct 11 14:55:01 2007 @@ -10,6 +10,7 @@ * * Authors: * Joachim Plack <jplack(a)suse.de> + * Olaf Dabrunz <od(a)suse.de> * * $Id$ * Modified: trunk/bootloader/src/generic/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/generic/dialogs.y… ============================================================================== --- trunk/bootloader/src/generic/dialogs.ycp (original) +++ trunk/bootloader/src/generic/dialogs.ycp Thu Oct 11 14:55:01 2007 @@ -10,6 +10,7 @@ * * Authors: * Joachim Plack <jplack(a)suse.de> + * Olaf Dabrunz <od(a)suse.de> * * $Id$ * Modified: trunk/bootloader/src/modules/BootArch.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootArch.… ============================================================================== --- trunk/bootloader/src/modules/BootArch.ycp (original) +++ trunk/bootloader/src/modules/BootArch.ycp Thu Oct 11 14:55:01 2007 @@ -12,6 +12,7 @@ * * Authors: * Jiri Srain <jsrain(a)suse.cz> + * Olaf Dabrunz <od(a)suse.de> * * $Id$ * Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommo… ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Thu Oct 11 14:55:01 2007 @@ -637,8 +637,15 @@ }); // convert device names in device map to the kernel device names - device_mapping = - mapmap (string k , string v, device_mapping, { + device_mapping = mapmap (string k , string v, device_mapping, { + // if we update from version 9 (SLES9), first convert old-style persistent + // device names to new-style persistent device names ("p1" -> "-part1") + // NOTE: this is idempotent; but other device name translation + // (e.g. libata migration) is not, so it will be done later + if (Mode::update () && installed_version["major"]:0 == 9) { + k = Storage::SLES9PersistentDevNames(k); + y2milestone( "devmap: dev name after SLES9 persistent dev name translation: %1", k); + } return $[BootCommon::MountByDev2Dev(k) : v]; }); @@ -646,16 +653,28 @@ // also, for legacy bootloaders like LILO that still pass device names, // convert the stage1_dev globals = mapmap (string k , string v, globals, { - if ( k == "stage1_dev" || regexpmatch(k, "^boot_.*custom$" ) ) + if ( k == "stage1_dev" || regexpmatch(k, "^boot_.*custom$" ) ) { + // see comments above + if (Mode::update () && installed_version["major"]:0 == 9) { + v = Storage::SLES9PersistentDevNames(v); + y2milestone( "globals: dev name after SLES9 persistent dev name translation: %1", v); + } return $[k : BootCommon::MountByDev2Dev(v)]; - else + } else { return $[k : v]; + } }); // convert root device names in sections to kernel device names, if // possible sections = maplist (map<string,any> s, sections, { - s["root"] = BootCommon::MountByDev2Dev(s["root"]:""); + string rdev = s["root"]:""; + // see comments above + if (Mode::update () && installed_version["major"]:0 == 9) { + rdev = Storage::SLES9PersistentDevNames(rdev); + y2milestone( "sections: dev name after SLES9 persistent dev name translation: %1", rdev); + } + s["root"] = BootCommon::MountByDev2Dev(rdev); return s; }); Modified: trunk/bootloader/src/modules/BootELILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootELILO… ============================================================================== --- trunk/bootloader/src/modules/BootELILO.ycp (original) +++ trunk/bootloader/src/modules/BootELILO.ycp Thu Oct 11 14:55:01 2007 @@ -14,6 +14,7 @@ * Joachim Plack <jplack(a)suse.de> * Jiri Srain <jsrain(a)suse.cz> * Andreas Schwab <schwab(a)suse.de> + * Olaf Dabrunz <od(a)suse.de> * Philipp Thomas <pth(a)suse.de> * * $Id$ Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Thu Oct 11 14:55:01 2007 @@ -12,6 +12,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * Joachim Plack <jplack(a)suse.de> + * Olaf Dabrunz <od(a)suse.de> * Philipp Thomas <pth(a)suse.de> * * $Id$ Modified: trunk/bootloader/src/modules/BootLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootLILO.… ============================================================================== --- trunk/bootloader/src/modules/BootLILO.ycp (original) +++ trunk/bootloader/src/modules/BootLILO.ycp Thu Oct 11 14:55:01 2007 @@ -11,6 +11,7 @@ * * Authors: * Jiri Srain <jsrain(a)suse.cz> + * Olaf Dabrunz <od(a)suse.de> * Philipp Thomas <pth(a)suse.de> * * $Id$ Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloade… ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Thu Oct 11 14:55:01 2007 @@ -10,6 +10,7 @@ * * Authors: * Jiri Srain <jsrain(a)suse.cz> + * Olaf Dabrunz <od(a)suse.de> * * $Id$ * Modified: trunk/bootloader/src/routines/autoinstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/autoinst… ============================================================================== --- trunk/bootloader/src/routines/autoinstall.ycp (original) +++ trunk/bootloader/src/routines/autoinstall.ycp Thu Oct 11 14:55:01 2007 @@ -10,6 +10,7 @@ * * Authors: * Jiri Srain <jsrain(a)suse.cz> + * Olaf Dabrunz <od(a)suse.de> * * $Id$ * Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike… ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Thu Oct 11 14:55:01 2007 @@ -10,6 +10,7 @@ * * Authors: * Jiri Srain <jsrain(a)suse.cz> + * Olaf Dabrunz <od(a)suse.de> * * $Id$ * Modified: trunk/bootloader/src/routines/popups.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/popups.y… ============================================================================== --- trunk/bootloader/src/routines/popups.ycp (original) +++ trunk/bootloader/src/routines/popups.ycp Thu Oct 11 14:55:01 2007 @@ -10,6 +10,7 @@ * * Authors: * Jiri Srain <jsrain(a)suse.cz> + * Olaf Dabrunz <od(a)suse.de> * * $Id$ * Modified: trunk/bootloader/src/routines/section_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/section_… ============================================================================== --- trunk/bootloader/src/routines/section_widgets.ycp (original) +++ trunk/bootloader/src/routines/section_widgets.ycp Thu Oct 11 14:55:01 2007 @@ -10,6 +10,7 @@ * * Authors: * Jiri Srain <jsrain(a)suse.cz> + * Olaf Dabrunz <od(a)suse.de> * * $Id$ * Modified: trunk/bootloader/src/routines/switcher.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/switcher… ============================================================================== --- trunk/bootloader/src/routines/switcher.ycp (original) +++ trunk/bootloader/src/routines/switcher.ycp Thu Oct 11 14:55:01 2007 @@ -10,6 +10,7 @@ * * Authors: * Jiri Srain <jsrain(a)suse.cz> + * Olaf Dabrunz <od(a)suse.de> * * $Id$ * -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0