From be424605afddcf72cd58fcc36f492f89162bc618 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 2 Dec 2002 17:42:22 +0000
Subject: use $::prefix

---
 perl-install/any.pm                       | 22 +++++++++++-----------
 perl-install/install_steps.pm             |  2 +-
 perl-install/install_steps_interactive.pm |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 9d703befe..3cded4dc1 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -358,25 +358,25 @@ sub pack_passwd {
 }
 
 sub get_autologin {
-    my ($prefix, $o) = @_;
-    my %l = getVarsFromSh("$prefix/etc/sysconfig/autologin");
+    my ($o) = @_;
+    my %l = getVarsFromSh("$::prefix/etc/sysconfig/autologin");
     $o->{autologin} ||= text2bool($l{AUTOLOGIN}) && $l{USER};
-    %l = getVarsFromSh("$prefix/etc/sysconfig/desktop");
+    %l = getVarsFromSh("$::prefix/etc/sysconfig/desktop");
     $o->{desktop} ||= $l{DESKTOP};
 }
 
 sub set_autologin {
-  my ($prefix, $user, $desktop) = @_;
+  my ($user, $desktop) = @_;
 
   if ($user) {
-      my %l = getVarsFromSh("$prefix/etc/sysconfig/desktop");
+      my %l = getVarsFromSh("$::prefix/etc/sysconfig/desktop");
       $l{DESKTOP} = $desktop;
-      setVarsInSh("$prefix/etc/sysconfig/desktop", \%l);
-      log::l("cat $prefix/etc/sysconfig/desktop ($desktop):\n", cat_("$prefix/etc/sysconfig/desktop"));
+      setVarsInSh("$::prefix/etc/sysconfig/desktop", \%l);
+      log::l("cat $::prefix/etc/sysconfig/desktop ($desktop):\n", cat_("$::prefix/etc/sysconfig/desktop"));
   }
-  setVarsInSh("$prefix/etc/sysconfig/autologin",
+  setVarsInSh("$::prefix/etc/sysconfig/autologin",
 	      { USER => $user, AUTOLOGIN => bool2yesno($user), EXEC => "/usr/X11R6/bin/startx" });
-  log::l("cat $prefix/etc/sysconfig/autologin ($user):\n", cat_("$prefix/etc/sysconfig/autologin"));
+  log::l("cat $::prefix/etc/sysconfig/autologin ($user):\n", cat_("$::prefix/etc/sysconfig/autologin"));
 }
 
 sub rotate_log {
@@ -800,9 +800,9 @@ sub ask_users {
 }
 
 sub autologin {
-    my ($prefix, $o, $in) = @_;
+    my ($o, $in) = @_;
 
-    my @wm = split(' ', run_program::rooted_get_stdout($prefix, '/usr/sbin/chksession', '-l'));
+    my @wm = split(' ', run_program::rooted_get_stdout($::prefix, '/usr/sbin/chksession', '-l'));
     my @users = map { $_->{name} } @{$o->{users} || []};
 
     if (@wm > 1 && @users && !$o->{authentication}{NIS} && $o->{security} <= 2) {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index cbd6cbc85..0892b39ab 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -771,7 +771,7 @@ sub addUser {
     any::addUsers($p, $users);
 
     $o->pkg_install("autologin") if $o->{autologin};
-    any::set_autologin($p, $o->{autologin}, $o->{desktop});
+    any::set_autologin($o->{autologin}, $o->{desktop});
 
     install_any::setAuthentication($o);
 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index c249ea4ee..a2258f64c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1159,8 +1159,8 @@ sub addUser {
     if ($o->{security} >= 1 || $clicked) {
 	any::ask_users($o->{prefix}, $o, $o->{users}, $o->{security});
     }
-    any::get_autologin($o->{prefix}, $o);
-    any::autologin($o->{prefix}, $o, $o);
+    any::get_autologin($o);
+    any::autologin($o, $o);
 
     install_steps::addUser($o);
 }
-- 
cgit v1.2.1