From 230c75dfce6576f56448b761a5ee84e7e7b1956e Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 10 Feb 2001 11:58:09 +0000
Subject: add step summary. remove steps configureTimezone and configurePrinter

---
 perl-install/install_steps.pm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'perl-install/install_steps.pm')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index a3fb7f72f..26c55950e 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -497,9 +497,17 @@ sub installCrypto {
     $o->pkg_install(@{$u->{packages}});
 }
 
+sub summary {
+    my ($o) = @_;
+    configureTimezone($o);
+    configurePrinter($o);
+}
+
 #------------------------------------------------------------------------------
 sub configureTimezone {
     my ($o) = @_;
+    install_any::preConfigureTimezone($o);
+
     require timezone;
     timezone::write($o->{prefix}, $o->{timezone});
 }
@@ -507,8 +515,10 @@ sub configureTimezone {
 #------------------------------------------------------------------------------
 sub configureServices {
     my ($o) = @_;
-    require services;
-    services::doit($o, $o->{services}, $o->{prefix}) if $o->{services};
+    if ($o->{services}) {
+	require services;
+	services::doit($o, $o->{services}, $o->{prefix});
+    }
 }
 #------------------------------------------------------------------------------
 sub configurePrinter {
-- 
cgit v1.2.1