[yast-commit] r52878 - in /trunk/installation: VERSION package/yast2-installation.changes src/include/misc.ycp

Author: aschnell Date: Tue Nov 4 13:21:16 2008 New Revision: 52878 URL: http://svn.opensuse.org/viewcvs/yast?rev=52878&view=rev Log: - improved warning about partitioning (fate #302857) Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/include/misc.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=52878&r1=52877&r2=52878&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Tue Nov 4 13:21:16 2008 @@ -1 +1 @@ -2.17.26 +2.17.27 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=52878&r1=52877&r2=52878&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Nov 4 13:21:16 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 04 13:14:10 CET 2008 - aschnell@suse.de + +- improved warning about partitioning (fate #302857) +- 2.17.27 + +------------------------------------------------------------------- Mon Nov 3 18:34:30 CET 2008 - locilka@suse.cz - Writing 'SecondStageRequired' 0/1 to /etc/install.inf even while @@ -76,7 +82,7 @@ Mon Oct 13 13:10:58 CEST 2008 - mzugec@suse.de - configure supportconfig in installation (fate#305180) -- 2.17.20 +- 2.17.20 ------------------------------------------------------------------- Mon Oct 13 09:45:23 CEST 2008 - locilka@suse.cz @@ -139,7 +145,7 @@ ------------------------------------------------------------------- Thu Oct 2 22:00:46 CEST 2008 - mzugec@suse.de -- changed Release Notes into Support group (bnc#430005) +- changed Release Notes into Support group (bnc#430005) ------------------------------------------------------------------- Thu Oct 2 19:13:07 CEST 2008 - locilka@suse.cz @@ -173,7 +179,7 @@ ------------------------------------------------------------------- Wed Oct 1 15:41:12 CEST 2008 - jsuchome@suse.cz -- if nn_NO language is selected, use nb_NO in YaST (bnc#426124) +- if nn_NO language is selected, use nb_NO in YaST (bnc#426124) ------------------------------------------------------------------- Wed Oct 1 13:42:18 CEST 2008 - locilka@suse.cz @@ -215,7 +221,7 @@ ------------------------------------------------------------------- Thu Sep 25 14:33:36 CEST 2008 - juhliarik@suse.cz -- added calling kdump_finish to inst_finish.ycp (bnc #427732) +- added calling kdump_finish to inst_finish.ycp (bnc #427732) ------------------------------------------------------------------- Tue Sep 23 16:17:27 CEST 2008 - locilka@suse.cz @@ -356,7 +362,7 @@ ------------------------------------------------------------------- Thu Aug 21 13:01:40 CEST 2008 - jsuchome@suse.cz -- check for command line mode in inst_suseconfig (bnc#419132) +- check for command line mode in inst_suseconfig (bnc#419132) ------------------------------------------------------------------- Tue Aug 19 15:45:07 CEST 2008 - jsrain@suse.cz @@ -568,7 +574,7 @@ ------------------------------------------------------------------- Wed May 28 16:23:22 CEST 2008 - ug@suse.de -- timeout in case of hardware probing problems +- timeout in case of hardware probing problems when autoyast is in use (especially for harddisk Reports) bnc#395099 - 2.16.48 @@ -609,7 +615,7 @@ Wed May 14 15:22:50 CEST 2008 - kmachalkova@suse.cz - inst_hostname client added to automatic configuration scripts - - needed to generate random hostname and 127.0.0.2 line in + needed to generate random hostname and 127.0.0.2 line in /etc/hosts (bnc #383336) ------------------------------------------------------------------- @@ -641,7 +647,7 @@ ------------------------------------------------------------------- Fri May 2 22:27:21 CEST 2008 - mzugec@suse.cz -- Don't stop network (by killing dhcpcd) at the end of 1.st stage +- Don't stop network (by killing dhcpcd) at the end of 1.st stage (bnc #386588) ------------------------------------------------------------------- @@ -727,7 +733,7 @@ ------------------------------------------------------------------- Fri Apr 18 16:01:13 CEST 2008 - juhliarik@suse.cz -- Added text for using kexec (yast_inf_finish.ycp) +- Added text for using kexec (yast_inf_finish.ycp) ------------------------------------------------------------------- Thu Apr 17 17:15:02 CEST 2008 - locilka@suse.cz @@ -793,7 +799,7 @@ ------------------------------------------------------------------- Fri Apr 11 15:33:17 CEST 2008 - juhliarik@suse.cz -- Added loading kernel via kexec (fate #303395) +- Added loading kernel via kexec (fate #303395) ------------------------------------------------------------------- Thu Apr 10 12:02:07 CEST 2008 - locilka@suse.cz Modified: trunk/installation/src/include/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/misc.ycp?rev=52878&r1=52877&r2=52878&view=diff ============================================================================== --- trunk/installation/src/include/misc.ycp (original) +++ trunk/installation/src/include/misc.ycp Tue Nov 4 13:21:16 2008 @@ -30,10 +30,11 @@ import "Linuxrc"; import "InstData"; import "HTML"; +import "Storage"; /** * Function appends blacklisted modules to the /etc/modprobe.d/blacklist - * file. + * file. * * More information in bugzilla #221815 */ @@ -126,24 +127,41 @@ **/ boolean confirmInstallation() { - // Heading for confirmation popup before the installation really starts - string heading = HTML::Heading (_("Confirm Installation")); + string heading = ""; + string body = ""; + string confirm_button_label = ""; - string body = - // Text for confirmation popup before the installation really starts 1/3 - _("<p>All information required for the base installation is now complete.</p>") - // Text for confirmation popup before the installation really starts 2/3 - + _(" -<p>If you continue now, partitions on your hard disk will be <b>formatted</b> -(erasing any existing data in those partitions) -according to the installation settings in the previous dialogs.</p>") - // Text for confirmation popup before the installation really starts 3/3 - + _("<p>Go back and check the settings if you are unsure.</p>") - ; + if (!Mode::update()) + { + // Heading for confirmation popup before the installation really starts + heading = HTML::Heading(_("Confirm Installation")); + + // Text for confirmation popup before the installation really starts 1/3 + body = _("<p>All information required for the base installation is now complete.</p>"); + + map commit_info = Storage::GetCommitInfo(); + if (commit_info[`destructive]:false) + { + // Text for confirmation popup before the installation really starts 2/3 + body = body + _("<p>If you continue now, <b>existing +partitions</b> on your hard disk will be <b>deleted</b> or <b>formatted</b> +(<b>erasing any existing data</b> in those partitions) according to the +installation settings in the previous dialogs.</p>"); + } + else + { + // Text for confirmation popup before the installation really starts 2/3 + body = body + _("<p>If you continue now, partitions on your +hard disk will be modified according to the installation settings in the +previous dialogs.</p>"); + } - string confirm_button_label = Label::InstallButton (); + // Text for confirmation popup before the installation really starts 3/3 + body = body + _("<p>Go back and check the settings if you are unsure.</p>"); - if ( Mode::update () ) + confirm_button_label = Label::InstallButton (); + } + else { // Heading for confirmation popup before the update really starts heading = "<h3>" + _("Confirm Update") + "</h3>"; @@ -153,7 +171,7 @@ _("<p>All information required to perform an update is now complete.</p>") // Text for confirmation popup before the update really starts 2/3 + _(" -<p>If you continue now, data on your hard disk will be overwritten +<p>If you continue now, data on your hard disk will be overwritten according to the settings in the previous dialogs.</p>") // Text for confirmation popup before the update really starts 3/3 + _("<p>Go back and check the settings if you are unsure.</p>") @@ -178,7 +196,7 @@ // bugzilla #273147 if (size_x >= 800 && size_y >= 600) { size_x = 70; - size_y = 18; + size_y = 18; } else { size_x = 54; size_y = 15; @@ -204,7 +222,7 @@ symbol button = (symbol) UI::UserInput(); UI::CloseDialog(); - return (button == `ok); + return button == `ok; } list <string> modules_to_enable_with_AC_on = nil; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org