summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-11-08 15:15:09 +0000
committerFrancois Pons <fpons@mandriva.com>1999-11-08 15:15:09 +0000
commitb8cb3272f5a12c46087c52d3cef120b46cb2d0ea (patch)
tree24da9fcb4b86bde78d89ae62839a58bb2f2d0e5c /perl-install
parent989f1150a37765385b92d9d561b2a2a0c9be4984 (diff)
downloaddrakx-backup-do-not-use-b8cb3272f5a12c46087c52d3cef120b46cb2d0ea.tar
drakx-backup-do-not-use-b8cb3272f5a12c46087c52d3cef120b46cb2d0ea.tar.gz
drakx-backup-do-not-use-b8cb3272f5a12c46087c52d3cef120b46cb2d0ea.tar.bz2
drakx-backup-do-not-use-b8cb3272f5a12c46087c52d3cef120b46cb2d0ea.tar.xz
drakx-backup-do-not-use-b8cb3272f5a12c46087c52d3cef120b46cb2d0ea.zip
*** empty log message ***
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps.pm5
-rw-r--r--perl-install/install_steps_interactive.pm8
-rw-r--r--perl-install/interactive_gtk.pm2
-rw-r--r--perl-install/share/compssList4
4 files changed, 10 insertions, 9 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index b2041a11c..077b90376 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -339,8 +339,9 @@ sub addUser($) {
} else {
my $u = $_->{uid} || ($_->{oldu} = (stat("$p$_->{home}"))[4]);
my $g = $_->{gid} || ($_->{oldg} = (stat("$p$_->{home}"))[5]);
- if (!$u || getpwuid($u)) { for ($u = 500; getpwuid($u) || $uids{$u}; $u++) {} }
- if (!$g || getgrgid($g)) { for ($g = 500; getgrgid($g) || $gids{$g}; $g++) {} }
+ #- search for available uid above 501 else initscripts may fail to change llanguage for KDE.
+ if (!$u || getpwuid($u)) { for ($u = 501; getpwuid($u) || $uids{$u}; $u++) {} }
+ if (!$g || getgrgid($g)) { for ($g = 501; getgrgid($g) || $gids{$g}; $g++) {} }
$_->{home} ||= "/home/$_->{name}";
$_->{uid} = $u; $uids{$u} = 1;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 1e9a667b3..ae96317f2 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -101,7 +101,7 @@ sub selectInstallClass($@) {
my @c = qw(beginner specific expert);
my %c = (
beginner => _("Recommended"),
- specific => _("Personalized"),
+ specific => _("Customized"),
expert => _("Expert"),
);
my $installClass = ${{reverse %c}}{$o->ask_from_list(_("Install Class"),
@@ -496,9 +496,9 @@ wish to access and any applicable user name and password."),
my $action;
my @action = qw(ascii ps both done);
my %action = (
- ascii => _("Yes, print ascii page"),
- ps => _("Yes, print postscript page"),
- both => _("Yes, print both pages"),
+ ascii => _("Yes, print ascii test page"),
+ ps => _("Yes, print postscript test page"),
+ both => _("Yes, print both test pages"),
done => _("No"),
);
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index fb4d5488c..c820b9f73 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -24,7 +24,7 @@ sub ask_from_listW {
my $w = my_gtk->new($title, %$o);
$w->{retval} = $def || $l->[0]; #- nearly especially for the X test case (see timeout in Xconfigurator.pm)
- if (@$l < 5 && sum(map { length $_ } @$l) < 90) {
+ if (@$l < 5) { #- really ? : && sum(map { length $_ } @$l) < 90) {
my $defW;
my $f = sub { $w->{retval} = $_[1]; Gtk->main_quit };
my $box = (@$l <= 2 && (map { split "\n" } @$messages) > 6) ?
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index 0db74f227..048750938 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -94,8 +94,8 @@ emacs-el 20 0 43
emacs-leim 20 0 50
emacs-nox 20 0 14
emacs-X11 41 0 83
-enlightenment 65 0 53
-enlightenment-conf 65 0 53
+enlightenment 70 0 55
+enlightenment-conf 70 0 55
enscript 17 0 71
esound 62 0 55
esound-devel 5 0 4