diff options
| -rw-r--r-- | perl-install/Xconfigurator.pm | 1 | ||||
| -rw-r--r-- | perl-install/devices.pm | 1 | ||||
| -rw-r--r-- | perl-install/install2.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 11 | ||||
| -rw-r--r-- | perl-install/share/compssList | 6 |
5 files changed, 14 insertions, 9 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 832fe0aa0..21b6f197f 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -751,5 +751,6 @@ _("I can set up your computer to automatically start X upon booting. Would you like X to start when you reboot?"), 1); rewriteInittab($run ? 5 : 3) unless $::testing; + run_program::rooted($prefix, "chkconfig", "--level", "5", "gpm", "off") if $o->{mouse}{device} =~ /ttyS/; } } diff --git a/perl-install/devices.pm b/perl-install/devices.pm index fd08d7739..116293983 100644 --- a/perl-install/devices.pm +++ b/perl-install/devices.pm @@ -100,6 +100,7 @@ sub make($) { "optcd" => [ c::S_IFBLK(), 17, 0 ], "sbpcd" => [ c::S_IFBLK(), 25, 0 ], "sjcd" => [ c::S_IFBLK(), 18, 0 ], + "psaux" => [ c::S_IFCHR(), 10, 1 ], "usbmouse"=> [ c::S_IFCHR(), 10, 32], #- aka hidbp-mse-0 "zero" => [ c::S_IFCHR(), 1, 5 ], }}{$_} or die "unknown device $_" }; diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 09e4a17fd..406fe81d6 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -142,7 +142,7 @@ $o = $::o = { authentification => { md5 => 1, shadow => 1 }, lang => 'en', isUpgrade => 0, -#- installClass => "beginner", +#- installClass => "normal", timezone => { #- timezone => "Europe/Paris", @@ -458,7 +458,7 @@ sub main { pcmcia => sub { $o->{pcmcia} = $v }, step => sub { $o->{steps}{first} = $v }, expert => sub { $o->{installClass} = 'expert'; $::expert = 1 }, - beginner => sub { $o->{installClass} = 'beginner'; $::beginner = 1 }, + beginner => sub { $o->{installClass} = 'normal'; $::beginner = 1 }, lnx4win => sub { $o->{lnx4win} = 1 }, readonly => sub { $o->{partitioning}{readonly} = 1 }, display => sub { $o->{display} = $v }, diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 72468ffcc..609187640 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -97,17 +97,17 @@ sub selectRootPartition($@) { #------------------------------------------------------------------------------ sub selectInstallClass($@) { my ($o, @classes) = @_; - my @c = qw(beginner specific expert); + my @c = qw(normal specific expert); my %c = ( - beginner => _("Recommended"), + normal => _("Recommended"), specific => _("Personalized"), expert => _("Expert"), ); my $installClass = ${{reverse %c}}{$o->ask_from_list(_("Install Class"), _("What installation class do you want?"), - [ map { $c{$_} } @c ], $c{$o->{installClass}} || $c{beginner})}; + [ map { $c{$_} } @c ], $c{$o->{installClass}} || $c{normal})}; $::expert = $installClass eq "expert"; - $::beginner = $installClass eq "beginner"; + $::beginner = $installClass eq "normal"; if ($::beginner) { $o->{installClass} = $installClass; @@ -184,6 +184,8 @@ sub rebootNeeded($) { install_steps::rebootNeeded($o); } + +#------------------------------------------------------------------------------ sub choosePartitionsToFormat($$) { my ($o, $fstab) = @_; @@ -211,6 +213,7 @@ sub formatPartitions { } } } + #------------------------------------------------------------------------------ sub setPackages { my ($o) = @_; diff --git a/perl-install/share/compssList b/perl-install/share/compssList index 3a32666d2..d98864a28 100644 --- a/perl-install/share/compssList +++ b/perl-install/share/compssList @@ -124,8 +124,8 @@ freetype-devel 1 0 0 fribidi 1 0 0 ftp 55 0 49 fvwm 40 0 36 -fvwm2 40 0 36 -fvwm2-icons 40 0 36 +fvwm2 90 0 36 +fvwm2-icons 90 0 36 fwhois 40 0 36 gaddr 45 0 40 gated 1 99 0 @@ -224,7 +224,7 @@ howto-sgml 25 0 22 ibtk 15 0 13 ical 30 0 27 iceconf 60 0 54 -icewm 90 0 80 +icewm 80 0 80 icewm-themes 60 0 54 ImageMagick 42 0 60 ImageMagick-devel 1 0 60 |