Author: jsuchome Date: Tue Aug 31 11:54:14 2010 New Revision: 62459 URL: http://svn.opensuse.org/viewcvs/yast?rev=62459&view=rev Log: - mkinitrd call is needed after time change with localtime (bnc#627116) - remember if NTP was set; save NTP settings (bnc#627818) - 2.19.19 Modified: branches/SuSE-Linux-11_3-Branch/country/VERSION branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes branches/SuSE-Linux-11_3-Branch/country/timezone/src/Timezone.ycp branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp Modified: branches/SuSE-Linux-11_3-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/country/VERSION?rev=62459&r1=62458&r2=62459&view=diff ============================================================================== --- branches/SuSE-Linux-11_3-Branch/country/VERSION (original) +++ branches/SuSE-Linux-11_3-Branch/country/VERSION Tue Aug 31 11:54:14 2010 @@ -1 +1 @@ -2.19.18 +2.19.19 Modified: branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes?rev=62459&r1=62458&r2=62459&view=diff ============================================================================== --- branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes Tue Aug 31 11:54:14 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Aug 31 11:43:09 CEST 2010 - jsuchome@suse.cz + +- mkinitrd call is needed after time change with localtime + (bnc#627116) +- remember if NTP was set; save NTP settings (bnc#627818) +- 2.19.19 + +------------------------------------------------------------------- Tue Aug 3 15:26:11 CEST 2010 - jsuchome@suse.cz - in text mode, set the timezone when leaving dialog (bnc#617861) Modified: branches/SuSE-Linux-11_3-Branch/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/country/timezone/src/Timezone.ycp?rev=62459&r1=62458&r2=62459&view=diff ============================================================================== --- branches/SuSE-Linux-11_3-Branch/country/timezone/src/Timezone.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/country/timezone/src/Timezone.ycp Tue Aug 31 11:54:14 2010 @@ -370,6 +370,14 @@ return; } +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 */ Modified: branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp?rev=62459&r1=62458&r2=62459&view=diff ============================================================================== --- branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp Tue Aug 31 11:54:14 2010 @@ -42,6 +42,9 @@ // if packages for NTP configuration are installed boolean ntp_installed = false; + // when checking for NTP status for first time, check the service status + boolean ntp_first_time = true; + /** * helper function for seting the time related stuff in module and possibly * adapting current time according to it @@ -264,7 +267,8 @@ ntp_rb = (boolean) ntp_call ("ui_init", $[ "replace_point": `id (`rp), "country" : Language::GetLanguageCountry(), - /*WTF*/"first_time" : true ]); + "first_time" : ntp_first_time ]); + ntp_first_time = false; UI::ChangeWidget(`id(`rb), `CurrentButton, (ntp_rb ? `ntp : `manual)); if (!dt_widgets) @@ -321,7 +325,7 @@ // before the sync, save the time zone (bnc#467318) Timezone::Set (Timezone::timezone, Stage::initial () && !Mode::live_installation ()); // true: go on, exit; false: loop on - boolean ntp_handled = (boolean) ntp_call ("ui_try_save", $[ "ntpdate_only" : true]); + boolean ntp_handled = (boolean) ntp_call ("ui_try_save", $[]); if (!ntp_handled) ret = `retry; // loop on else @@ -378,7 +382,21 @@ } else { + // in case of local time, we need to call mkinitrd (after setting timezone) + if (Timezone::hwclock == "--localtime" && !Stage::initial ()) + { + Timezone::Set (Timezone::timezone, true); + } + Timezone::SetTime( year, month, day, hour, minute, second ); + + if (Timezone::hwclock == "--localtime" && !Stage::initial ()) + { + // busy message + Popup::ShowFeedback ("", _("Updating initrd...")); + Timezone::CallMkinitrd (); + Popup::ClearFeedback (); + } } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org