Author: jsuchome Date: Thu Aug 11 16:31:38 2011 New Revision: 65309 URL: http://svn.opensuse.org/viewcvs/yast?rev=65309&view=rev Log: - call mkinitrd on hwclock changes (bnc#689095) - 2.13.59 Modified: branches/SuSE-SLE-10-SP4-Branch/country/VERSION branches/SuSE-SLE-10-SP4-Branch/country/package/yast2-country.changes branches/SuSE-SLE-10-SP4-Branch/country/timezone/src/Timezone.ycp branches/SuSE-SLE-10-SP4-Branch/country/timezone/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/country/VERSION?rev=65309&r1=65308&r2=65309&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/country/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/country/VERSION Thu Aug 11 16:31:38 2011 @@ -1 +1 @@ -2.13.58 +2.13.59 Modified: branches/SuSE-SLE-10-SP4-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/country/package/yast2-country.changes?rev=65309&r1=65308&r2=65309&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/country/package/yast2-country.changes Thu Aug 11 16:31:38 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 11 16:30:36 CEST 2011 - jsuchome@suse.cz + +- call mkinitrd on hwclock changes (bnc#689095) +- 2.13.59 + +------------------------------------------------------------------- Thu Nov 25 14:07:12 CET 2010 - jsuchome@suse.cz - update of timezones: use cities, not countries (bnc#652896) Modified: branches/SuSE-SLE-10-SP4-Branch/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/country/timezone/src/Timezone.ycp?rev=65309&r1=65308&r2=65309&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/country/timezone/src/Timezone.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/country/timezone/src/Timezone.ycp Thu Aug 11 16:31:38 2011 @@ -63,6 +63,8 @@ // END: Globally defined data to be accessed via Timezone::<variable> // ------------------------------------------------------------------ +// if mkinitrd should be called at the end +global boolean call_mkinitrd = false; // ------------------------------------------------------------------ @@ -290,6 +292,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 */ @@ -643,6 +653,11 @@ y2milestone( "Save Saved data for timezone: <%1>", timezone ); + if (call_mkinitrd && !Stage::initial ()) + { + CallMkinitrd (); + } + return; } Modified: branches/SuSE-SLE-10-SP4-Branch/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/country/timezone/src/dialogs.ycp?rev=65309&r1=65308&r2=65309&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/country/timezone/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/country/timezone/src/dialogs.ycp Thu Aug 11 16:31:38 2011 @@ -207,7 +207,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; + } } } } @@ -244,6 +255,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 ); @@ -471,6 +483,12 @@ // Timezone::user_decision = true; Timezone::user_hwclock = true; + // 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