|
Lines 261-273
Link Here
|
| 261 |
hwclock = ( AutoinstGeneral::Clock["hwclock"]:"" == "UTC" ) ? "-u" : "--localtime"; |
261 |
hwclock = ( AutoinstGeneral::Clock["hwclock"]:"" == "UTC" ) ? "-u" : "--localtime"; |
| 262 |
} |
262 |
} |
| 263 |
|
263 |
|
| 264 |
string date = ""; |
264 |
// Initially set the current timezone to establish a consistent state. |
| 265 |
|
265 |
// |
| 266 |
if (Mode::config () || Mode::mode () == "firstboot") |
266 |
integer sel = 0; |
|
|
267 |
if (Mode::config ()) |
| 267 |
{ |
268 |
{ |
| 268 |
Wizard::HideAbortButton(); |
269 |
import "AutoinstGeneral"; |
|
|
270 |
sel = Timezone::Set (AutoinstGeneral::Clock["timezone"]:"", true); |
| 269 |
} |
271 |
} |
|
|
272 |
else |
| 273 |
{ |
| 274 |
sel = Timezone::Set (timezone, true); |
| 275 |
} |
| 270 |
|
276 |
|
|
|
277 |
|
| 271 |
boolean utc_only = Timezone::utc_only (); |
278 |
boolean utc_only = Timezone::utc_only (); |
| 272 |
y2milestone( "utc_only %1", utc_only ); |
279 |
y2milestone( "utc_only %1", utc_only ); |
| 273 |
|
280 |
|
|
Lines 277-283
Link Here
|
| 277 |
|
284 |
|
| 278 |
// Assign system date and time. |
285 |
// Assign system date and time. |
| 279 |
// |
286 |
// |
| 280 |
date = Timezone::GetDateTime(true, false);//true); |
287 |
string date = Timezone::GetDateTime(true, false);//true); |
| 281 |
|
288 |
|
| 282 |
// build up timezone selection box |
289 |
// build up timezone selection box |
| 283 |
// |
290 |
// |
|
Lines 371-379
Link Here
|
| 371 |
If the current time is not correct, use <b>Change Time or Date</b> to adjust it. |
378 |
If the current time is not correct, use <b>Change Time or Date</b> to adjust it. |
| 372 |
</p>"); |
379 |
</p>"); |
| 373 |
|
380 |
|
|
|
381 |
if (Mode::config () || Mode::mode () == "firstboot") |
| 382 |
{ |
| 383 |
Wizard::HideAbortButton(); |
| 384 |
} |
| 385 |
|
| 374 |
// Screen title for timezone screen |
386 |
// Screen title for timezone screen |
| 375 |
Wizard::SetContents (_("Clock and Time Zone"), contents, |
387 |
Wizard::SetContents (_("Clock and Time Zone"), contents, |
| 376 |
help_text, GetInstArgs::enable_back(), GetInstArgs::enable_next() ); |
388 |
help_text, GetInstArgs::enable_back(), GetInstArgs::enable_next()); |
| 377 |
|
389 |
|
| 378 |
Wizard::SetDesktopIcon ("timezone"); |
390 |
Wizard::SetDesktopIcon ("timezone"); |
| 379 |
if ( Stage::initial () || Stage::firstboot ()) |
391 |
if ( Stage::initial () || Stage::firstboot ()) |
|
Lines 381-400
Link Here
|
| 381 |
Wizard::SetTitleIcon ("yast-timezone"); |
393 |
Wizard::SetTitleIcon ("yast-timezone"); |
| 382 |
} |
394 |
} |
| 383 |
|
395 |
|
| 384 |
|
|
|
| 385 |
// Initially set the current timezone to establish a consistent state. |
| 386 |
// |
| 387 |
integer sel = 0; |
| 388 |
if (Mode::config ()) |
| 389 |
{ |
| 390 |
import "AutoinstGeneral"; |
| 391 |
sel = Timezone::Set (AutoinstGeneral::Clock["timezone"]:"", true); |
| 392 |
} |
| 393 |
else |
| 394 |
{ |
| 395 |
sel = Timezone::Set (timezone, true); |
| 396 |
} |
| 397 |
|
| 398 |
symbol hwclock_s = (hwclock=="-u") ? `hwclock_utc : `hwclock_localtime; |
396 |
symbol hwclock_s = (hwclock=="-u") ? `hwclock_utc : `hwclock_localtime; |
| 399 |
symbol hwclock_s_old = hwclock_s; |
397 |
symbol hwclock_s_old = hwclock_s; |
| 400 |
hwclock_s_initial = hwclock_s; |
398 |
hwclock_s_initial = hwclock_s; |