Author: jsuchome Date: Wed Nov 24 11:14:46 2010 New Revision: 62877 URL: http://svn.opensuse.org/viewcvs/yast?rev=62877&view=rev Log: - call mkinitrd also when hwclock changes (bnc#638128, bnc#638185) - 2.18.21 Modified: branches/SuSE-Linux-11_2-Branch/country/VERSION branches/SuSE-Linux-11_2-Branch/country/package/yast2-country.changes branches/SuSE-Linux-11_2-Branch/country/timezone/src/Timezone.ycp branches/SuSE-Linux-11_2-Branch/country/timezone/src/dialogs.ycp Modified: branches/SuSE-Linux-11_2-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/country/VERSION?rev=62877&r1=62876&r2=62877&view=diff ============================================================================== --- branches/SuSE-Linux-11_2-Branch/country/VERSION (original) +++ branches/SuSE-Linux-11_2-Branch/country/VERSION Wed Nov 24 11:14:46 2010 @@ -1 +1 @@ -2.18.20 +2.18.21 Modified: branches/SuSE-Linux-11_2-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/country/package/yast2-country.changes?rev=62877&r1=62876&r2=62877&view=diff ============================================================================== --- branches/SuSE-Linux-11_2-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-Linux-11_2-Branch/country/package/yast2-country.changes Wed Nov 24 11:14:46 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 24 10:07:09 CET 2010 - jsuchome@suse.cz + +- call mkinitrd also when hwclock changes (bnc#638128, bnc#638185) +- 2.18.21 + +------------------------------------------------------------------- Fri Oct 2 09:15:17 CEST 2009 - jsuchome@suse.cz - YaPI: check keys in args map Modified: branches/SuSE-Linux-11_2-Branch/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/country/timezone/src/Timezone.ycp?rev=62877&r1=62876&r2=62877&view=diff ============================================================================== --- branches/SuSE-Linux-11_2-Branch/country/timezone/src/Timezone.ycp (original) +++ branches/SuSE-Linux-11_2-Branch/country/timezone/src/Timezone.ycp Wed Nov 24 11:14:46 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 = $[ @@ -359,6 +361,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 */ @@ -733,6 +743,11 @@ y2milestone( "Save Saved data for timezone: <%1>", timezone ); + if (call_mkinitrd && !Stage::initial ()) + { + CallMkinitrd (); + } + return; } Modified: branches/SuSE-Linux-11_2-Branch/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/country/timezone/src/dialogs.ycp?rev=62877&r1=62876&r2=62877&view=diff ============================================================================== --- branches/SuSE-Linux-11_2-Branch/country/timezone/src/dialogs.ycp (original) +++ branches/SuSE-Linux-11_2-Branch/country/timezone/src/dialogs.ycp Wed Nov 24 11:14:46 2010 @@ -346,6 +346,13 @@ } 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::call_mkinitrd = true; + } + Timezone::SetTime( year, month, day, hour, minute, second ); } } @@ -385,6 +392,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 ); @@ -805,6 +813,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