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

Author: jsuchome Date: Thu Apr 1 13:30:31 2010 New Revision: 61566 URL: http://svn.opensuse.org/viewcvs/yast?rev=61566&view=rev Log: - '/sbin/hwclock --systz' can be called only once (bnc#584484) - 2.17.44 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 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=61566&r1=61565&r2=61566&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/country/VERSION Thu Apr 1 13:30:31 2010 @@ -1 +1 @@ -2.17.43 +2.17.44 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=61566&r1=61565&r2=61566&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 Thu Apr 1 13:30:31 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 1 13:22:33 CEST 2010 - jsuchome@suse.cz + +- '/sbin/hwclock --systz' can be called only once (bnc#584484) +- 2.17.44 + +------------------------------------------------------------------- Wed Mar 10 12:20:28 CET 2010 - jsuchome@suse.cz - call /sbin/hwclock --systz in case of local time (bnc#550697, 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=61566&r1=61565&r2=61566&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 Thu Apr 1 13:30:31 2010 @@ -148,6 +148,9 @@ // 'language --> default timezone' conversion map map lang2tz = $[]; +// remember if /sbin/hwclock --hctosys was called, it can be done only once (bnc#584484) +boolean systz_called = false; + // ------------------------------------------------------------------ // END: Locally defined data // ------------------------------------------------------------------ @@ -261,7 +264,11 @@ cmd = "/sbin/hwclock --hctosys " + hwclock; if (Stage::initial () && hwclock == "--localtime") { - cmd = "/sbin/hwclock --systz --localtime --noadjfile && touch /dev/shm/warpclock"; + if (!systz_called) + { + cmd = "/sbin/hwclock --systz --localtime --noadjfile && touch /dev/shm/warpclock"; + systz_called = true; + } } y2milestone( "Set cmd %1", cmd ); y2milestone( "Set ret %1", SCR::Execute(.target.bash_output, cmd )); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org