Author: jsuchome Date: Tue Nov 9 15:48:32 2010 New Revision: 62785 URL: http://svn.opensuse.org/viewcvs/yast?rev=62785&view=rev Log: - call mkinitrd also when hwclock changes (bnc#638128, bnc#638185) - 2.20.4 Modified: trunk/country/VERSION trunk/country/package/yast2-country.changes trunk/country/timezone/src/Timezone.ycp trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=62785&r1=62784&r2=62785&view=diff ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Tue Nov 9 15:48:32 2010 @@ -1 +1 @@ -2.20.3 +2.20.4 Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=62785&r1=62784&r2=62785&view=diff ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Tue Nov 9 15:48:32 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 9 15:19:22 CET 2010 - jsuchome@suse.cz + +- call mkinitrd also when hwclock changes (bnc#638128, bnc#638185) +- 2.20.4 + +------------------------------------------------------------------- Mon Nov 8 14:24:53 UTC 2010 - lslezak@suse.cz - don't install recommended packages for already installed packages Modified: trunk/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/Timezone.ycp?rev=62785&r1=62784&r2=62785&view=diff ============================================================================== --- trunk/country/timezone/src/Timezone.ycp (original) +++ trunk/country/timezone/src/Timezone.ycp Tue Nov 9 15:48:32 2010 @@ -59,6 +59,8 @@ */ global boolean windows_partition = false; +// if mkinitrd should be called at the end +global boolean call_mkinitrd = false; // translation of correct timezone to the one that could be shown in map widget global map <string,string> yast2zonetab = $[ @@ -378,6 +380,14 @@ return true; } +global boolean CallMkinitrd () { + + y2milestone ("calling mkinitrd..."); + SCR::Execute (.target.bash, "/sbin/mkinitrd >> /var/log/YaST2/y2logmkinitrd 2>> /var/log/YaST2/y2logmkinitrd"); + y2milestone ("... done"); + return true; +} + /** * Set the new time and date given by user */ @@ -754,6 +764,11 @@ y2milestone( "Save Saved data for timezone: <%1>", timezone ); + if (call_mkinitrd && !Stage::initial ()) + { + CallMkinitrd (); + } + return; } Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp?rev=62785&r1=62784&r2=62785&view=diff ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Tue Nov 9 15:48:32 2010 @@ -392,10 +392,7 @@ if (Timezone::hwclock == "--localtime" && !Stage::initial ()) { - // busy message - Popup::ShowFeedback ("", _("Updating initrd...")); - Timezone::CallMkinitrd (); - Popup::ClearFeedback (); + Timezone::call_mkinitrd = true; } } } @@ -439,6 +436,7 @@ boolean changed_time = false; string timezone = Timezone::timezone; string timezone_old = timezone; + string timezone_initial = timezone; string hwclock = Timezone::hwclock; y2milestone ( "timezone_old %1", timezone_old ); @@ -875,6 +873,12 @@ Timezone::user_decision = true; Timezone::user_hwclock = true; Timezone::ntp_used = ntp_used; + // See bnc#638185c5: refresh_initrd should be called if HWCLOCK is changed (--localtime <-> --utc) and/or + // if --localtime is set and TIMEZONE will be changed. + if (hwclock_s != hwclock_s_initial || (hwclock_s == `hwclock_localtime && timezone != timezone_initial)) + { + Timezone::call_mkinitrd = true; + } if (ntp_used && ntp_server != "") { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org