diff options
Diffstat (limited to 'perl-install/Xconfig/various.pm')
| -rw-r--r-- | perl-install/Xconfig/various.pm | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/perl-install/Xconfig/various.pm b/perl-install/Xconfig/various.pm index e69d40549..1ce1ce37e 100644 --- a/perl-install/Xconfig/various.pm +++ b/perl-install/Xconfig/various.pm @@ -18,9 +18,9 @@ sub to_string { sub info { my ($raw_X, $card) = @_; my $info; - my $xf_ver = Xconfig::card::xfree4_version(); - my $title = $card->{use_DRI_GLX} ? N("XFree %s with 3D hardware acceleration", $xf_ver) : - N("XFree %s", $xf_ver); + my $xf_ver = Xconfig::card::xorg_version(); + my $title = $card->{use_DRI_GLX} ? N("Xorg %s with 3D hardware acceleration", $xf_ver) : + N("Xorg %s", $xf_ver); my $keyboard = eval { $raw_X->get_keyboard } || {}; my @monitors = eval { $raw_X->get_monitors }; my $device = eval { $raw_X->get_device } || {}; @@ -40,7 +40,7 @@ sub info { $info .= N("Color depth: %s\n", translate($Xconfig::resolution_and_depth::depth2text{$resolution->{Depth}})); $info .= N("Resolution: %s\n", join('x', @$resolution{'X', 'Y'})); } - $info .= N("XFree86 driver: %s\n", $device->{Driver}) if $device->{Driver}; + $info .= N("Xorg driver: %s\n", $device->{Driver}) if $device->{Driver}; "$title\n\n$info"; } @@ -53,11 +53,11 @@ sub various { } sub runlevel { - my ($runlevel) = @_; + my ($o_runlevel) = @_; my $f = "$::prefix/etc/inittab"; -r $f or log::l("missing inittab!!!"), return; - if ($runlevel) { - substInFile { s/^id:\d:initdefault:\s*$/id:$runlevel:initdefault:\n/ } $f if !$::testing; + if ($o_runlevel) { + substInFile { s/^id:\d:initdefault:\s*$/id:$o_runlevel:initdefault:\n/ } $f if !$::testing; } else { cat_($f) =~ /^id:(\d):initdefault:\s*$/m && $1; } @@ -71,8 +71,8 @@ sub choose_xdm { $xdm = $in->ask_yesorno_({ title => N("Graphical interface at startup"), messages => -N("I can setup your computer to automatically start the graphical interface (XFree) upon booting. -Would you like XFree to start when you reboot?"), +N("I can setup your computer to automatically start the graphical interface (Xorg) upon booting. +Would you like Xorg to start when you reboot?"), interactive_help_id => 'configureXxdm', }, $xdm); } @@ -98,13 +98,13 @@ Do you have this feature?")) or return; $norm = $in->ask_from_list('', N("What norm is your TV using?"), [ 'NTSC', 'PAL' ], $norm) or return; - configure_FB_TVOUT({ norm => $norm }); + configure_FB_TVOUT($in->do_pkgs, { norm => $norm }); } sub configure_FB_TVOUT { - my ($use_FB_TVOUT) = @_; + my ($do_pkgs, $use_FB_TVOUT) = @_; - my $raw_X = Xconfig::default::configure(); + my $raw_X = Xconfig::default::configure($do_pkgs); return if is_empty_array_ref($raw_X); $raw_X->set_monitors({ HorizSync => '30-50', VertRefresh => ($use_FB_TVOUT->{norm} eq 'NTSC' ? 60 : 50) }); @@ -131,22 +131,21 @@ sub configure_FB_TVOUT { require bootloader; require fsedit; require detect_devices; - my ($bootloader, $all_hds) = - $::isInstall ? ($::o->{bootloader}, $::o->{all_hds}) : - (bootloader::read(), fsedit::get_hds()); + my $all_hds = $::isInstall ? $::o->{all_hds} : fsedit::get_hds(); + my $bootloader = $::isInstall ? $::o->{bootloader} : bootloader::read(fs::get::fstab($all_hds)); if (my $tvout = bootloader::duplicate_kernel_entry($bootloader, 'TVout')) { $tvout->{append} .= " XFree=tvout"; - bootloader::install($bootloader, $all_hds->{hds}); + bootloader::install($bootloader, $all_hds); } } } sub check_XF86Config_symlink() { - my $f = "$::prefix/etc/X11/XF86Config-4"; + my $f = "$::prefix/etc/X11/XF86Config"; if (!-l $f && -e "$f.tvout") { rename $f, "$f.standard"; - symlink "XF86Config-4.standard", $f; + symlink "XF86Config.standard", $f; } } |