summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2004-09-01 02:25:14 +0000
committerFlorent Villard <warly@mandriva.com>2004-09-01 02:25:14 +0000
commit44b7362589cdb92d3171a8a1c15bb38623b4f623 (patch)
tree3167c8976fd69515d77bdd55320d83d7658d423a
parent892cca4437f2643ac25c87cf35d4e1a0a97358e6 (diff)
downloaddrakx-backup-do-not-use-44b7362589cdb92d3171a8a1c15bb38623b4f623.tar
drakx-backup-do-not-use-44b7362589cdb92d3171a8a1c15bb38623b4f623.tar.gz
drakx-backup-do-not-use-44b7362589cdb92d3171a8a1c15bb38623b4f623.tar.bz2
drakx-backup-do-not-use-44b7362589cdb92d3171a8a1c15bb38623b4f623.tar.xz
drakx-backup-do-not-use-44b7362589cdb92d3171a8a1c15bb38623b4f623.zip
Do not perform a date command when ntpdate has just been called
-rwxr-xr-xperl-install/standalone/drakclock20
1 files changed, 10 insertions, 10 deletions
diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock
index a2cba1686..cf2c02fdf 100755
--- a/perl-install/standalone/drakclock
+++ b/perl-install/standalone/drakclock
@@ -120,16 +120,16 @@ $my_win->{window}->add(gtkpack_(gtkset_border_width(Gtk2::VBox->new, $::isEmbedd
system("service ntpd start");
} else {
if (-e $ntpdlock) {
- system("service ntpd stop");
- system("/sbin/chkconfig --level 35 ntpd off");
- }
- }
- my ($year, $month, $day) = $calendar->get_date;
- $month++;
- my ($hour, $min, $sec) = ($adjh->get_value, $adjm->get_value, $adjs->get_value);
- system("date " .
- join('', map { print_it0($_) } ($month, $day, $hour, $min, $year)) . '.' . print_it0($sec));
- -e '/sbin/hwclock' and system('/sbin/hwclock --systohc');
+ system("service ntpd stop");
+ system("/sbin/chkconfig --level 35 ntpd off");
+ }
+ my ($year, $month, $day) = $calendar->get_date;
+ $month++;
+ my ($hour, $min, $sec) = ($adjh->get_value, $adjm->get_value, $adjs->get_value);
+ system("date " .
+ join('', map { print_it0($_) } ($month, $day, $hour, $min, $year)) . '.' . print_it0($sec));
+ }
+ -e '/sbin/hwclock' and system('/sbin/hwclock --systohc');
system("dcop kicker Panel restart") if $ENV{DESKTOP} eq 'kde';
ugtk2->exit(0);
},