[yast-commit] r62948 - in /branches/SuSE-Code-11-SP1-Branch/country: VERSION package/yast2-country.changes timezone/src/Timezone.ycp timezone/src/dialogs.ycp

Author: jsuchome Date: Mon Dec 6 14:38:41 2010 New Revision: 62948 URL: http://svn.opensuse.org/viewcvs/yast?rev=62948&view=rev Log: - call mkinitrd on hwclock changes (bnc#638128) - 2.17.50 Modified: branches/SuSE-Code-11-SP1-Branch/country/VERSION branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes branches/SuSE-Code-11-SP1-Branch/country/timezone/src/Timezone.ycp branches/SuSE-Code-11-SP1-Branch/country/timezone/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP1-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/country/VERSION?rev=62948&r1=62947&r2=62948&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/country/VERSION Mon Dec 6 14:38:41 2010 @@ -1 +1 @@ -2.17.49 +2.17.50 Modified: branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes?rev=62948&r1=62947&r2=62948&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes Mon Dec 6 14:38:41 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 9 15:18:23 CET 2010 - jsuchome@suse.cz + +- call mkinitrd on hwclock changes (bnc#638128) +- 2.17.50 + +------------------------------------------------------------------- Thu May 13 13:30:04 CEST 2010 - jsuchome@suse.cz - use Dutch keyboard layout as a default for Dutch (bnc#603955) Modified: branches/SuSE-Code-11-SP1-Branch/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/country/timezone/src/Timezone.ycp?rev=62948&r1=62947&r2=62948&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/timezone/src/Timezone.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/country/timezone/src/Timezone.ycp Mon Dec 6 14:38:41 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 yast2zonetab = $[ @@ -370,6 +372,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 */ @@ -744,6 +754,11 @@ y2milestone( "Save Saved data for timezone: <%1>", timezone ); + if (call_mkinitrd && !Stage::initial ()) + { + CallMkinitrd (); + } + return; } Modified: branches/SuSE-Code-11-SP1-Branch/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/country/timezone/src/dialogs.ycp?rev=62948&r1=62947&r2=62948&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/timezone/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/country/timezone/src/dialogs.ycp Mon Dec 6 14:38:41 2010 @@ -363,7 +363,18 @@ } 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 ()) + { + Timezone::call_mkinitrd = true; + } } // if (ntp_was_used) FIXME remove NTP config now? } @@ -438,6 +449,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 ); @@ -859,6 +871,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; + } } } } until ( ret == `next || ret == `back || ret == `cancel ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org