summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-17 13:00:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-17 13:00:30 +0000
commit775534f625a05db82b3492a50cd6d67d1f30e122 (patch)
tree48cbf2c7b822bb224c9a44201783d6d97ec17d5a /perl-install/install_steps.pm
parentc60b796a26ac6510d4089bdfdc3ae92f206ca382 (diff)
downloaddrakx-775534f625a05db82b3492a50cd6d67d1f30e122.tar
drakx-775534f625a05db82b3492a50cd6d67d1f30e122.tar.gz
drakx-775534f625a05db82b3492a50cd6d67d1f30e122.tar.bz2
drakx-775534f625a05db82b3492a50cd6d67d1f30e122.tar.xz
drakx-775534f625a05db82b3492a50cd6d67d1f30e122.zip
Big Xconfigurator.pm cleanup/rework
- use $X instead of $o (to avoid name conflict with DrakX's $o) - {flag}{noclockprobe} unused, dropping it - rename {memory} into "VideoRam" - rename {ramdac} into {Ramdac} - rename {chipset} into {Chipset} - rename {clockchip} into {Clockchip} - rename {keyboard}{xkb_model} into {keyboard}{XkbModel} - rename {keyboard}{xkb_keymap} into {keyboard}{XkbLayout} - drop {mouse}{chordmiddle} (obsolete) - drop {mouse}{cleardtrrts} (obsolete, was not written to XF4 config) - &testConfig is unused, removing it - as a concequence, {clocklines} is never set, dropping it - when UNSUPPORTED remove {driver}, instead of setting {flag}{unsupported} - Cards+ now only provide {Chipset} for cards needing it => {flag}{needChipset} not needed anymore - moved setting needVideoRam in Cards+ (via NEEDVIDEORAM) (hoping it will work: since the regexp was broken, it was never done. (it was applied on the module field of pcitable, instead of the description)) - dropped modelines_text_Trident_TG_96xx case (it has never been used) - rename %xkb_options into %XkbOptions - rename {DRI_glx} into {DRI_GLX}, the value now comes from Cards+ instead of regexp'ing {identifier} - rename {Utah_glx} into {UTAH_GLX}, the value now comes from Cards+ instead of regexp'ing {identifier} - rename {Utah_glx_EXPERIMENTAL} into {UTAH_GLX_EXPERIMENTAL}, the value now comes from Cards+ instead of regexp'ing {identifier} - very_bad_card and bad_card are now the same, the value now comes from Cards+ (BAD_FB_RESTORE & BAD_FB_RESTORE_XF3) - drop unused @accelservers - remove $modelines_text_apple, use $modelines_text_ext instead - don't use a <Section "Modes"> together with <UseModes "Mac Modes">, put directly modelines in Section "Monitor" (why should ppc behave differently than others!?) - replace (conflicting) ModeLines "1280x1024 @ 74 Hz" and "1280x1024 @ 76 Hz" with "1280x1024 @ 75 Hz" (from ddcxinfos) - drop ModeLine "640x480 @ 72 Hz" (it conflicts, and anyway, it has no real use nowadays :) - drop comments about HorizSync, VertRefresh and ModeLine's from XF86Config - drop many unneeded stuff from XF86Config: AutoRepeat, Xqueue, Xleds, NoTrapSignals, XkbTypes, XkbKeycodes, XkbCompat, XkbRules, LeftAlt/RightAlt/ScrollLock/RightCtl - drop section comments from XF86Config - drop XF86_Mono configuration (it doesn't work anyway, seems like it needs a special ModeLine?) - drop 320x200 with XF86_SVGA (who can use this!?) - do not write Screen section "accel" if the server configured is not an accel one - drop the "Generic VGA" Device section for XF4 (this device is unused) - drop {monitor}{vendor}, {monitor}{model}, {card}{vendor}, {card}{model}, {card}{board} (only description strings, not useful for running the server) - use x_res instead of wres for things like 1024 in 1024x768
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 982e49534..953b0f819 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -881,7 +881,7 @@ sub setupBootloader($) {
#------------------------------------------------------------------------------
sub configureXBefore {
my ($o) = @_;
- my $xkb = $o->{X}{keyboard}{xkb_keymap} || keyboard::keyboard2xkb($o->{keyboard});
+ my $xkb = $o->{X}{keyboard}{XkbLayout} || keyboard::keyboard2xkb($o->{keyboard});
$xkb = '' if !($xkb && $xkb =~ /([^(]*)/ && -e "$o->{prefix}/usr/X11R6/lib/X11/xkb/symbols/$1");
if (!$xkb && (my $f = keyboard::xmodmap_file($o->{keyboard}))) {
cp_af($f, "$o->{prefix}/etc/X11/xinit/Xmodmap");
@@ -891,7 +891,7 @@ sub configureXBefore {
my $f = "$o->{prefix}/etc/sysconfig/i18n";
setVarsInSh($f, add2hash_({ XKB_IN_USE => $xkb ? '': 'no' }, { getVarsFromSh($f) }));
}
- $o->{X}{keyboard}{xkb_keymap} = $xkb;
+ $o->{X}{keyboard}{XkbLayout} = $xkb;
$o->{X}{mouse} = $o->{mouse};
$o->{X}{wacom} = $o->{wacom};
@@ -921,12 +921,12 @@ sub configureX {
sub configureXAfter {
my ($o) = @_;
if ($o->{X}{card}{server} eq 'FBDev') {
- unless (install_any::setupFB($o, Xconfigurator::getVGAMode($o->{X}))) {
+ install_any::setupFB($o, $o->{X}{card}{bios_vga_mode}) or do {
log::l("disabling automatic start-up of X11 if any as setup framebuffer failed");
- any::runlevel($o->{prefix}, 3) unless $::testing; #- disable automatic start-up of X11 on error.
- }
+ any::runlevel($o->{prefix}, 3); #- disable automatic start-up of X11 on error.
+ };
}
- if ($o->{X}{default_depth} >= 16 && $o->{X}{card}{default_wres} >= 1024) {
+ if ($o->{X}{default_depth} >= 16 && $o->{X}{card}{default_x_res} >= 1024) {
log::l("setting large icon style for kde");
install_any::kderc_largedisplay($o->{prefix});
}