diff options
| author | Mystery Man 553 <uid553@mandriva.org> | 2002-12-04 12:21:11 +0000 |
|---|---|---|
| committer | Mystery Man 553 <uid553@mandriva.org> | 2002-12-04 12:21:11 +0000 |
| commit | dcee89716a147843013cee7a55751789b1ba1bc1 (patch) | |
| tree | ba50d73a3dc8c362a03f6fefd05f9eb54849a772 /perl-install | |
| parent | b67d61d3839cf809bafb4360ab13abcde163de93 (diff) | |
| download | drakx-dcee89716a147843013cee7a55751789b1ba1bc1.tar drakx-dcee89716a147843013cee7a55751789b1ba1bc1.tar.gz drakx-dcee89716a147843013cee7a55751789b1ba1bc1.tar.bz2 drakx-dcee89716a147843013cee7a55751789b1ba1bc1.tar.xz drakx-dcee89716a147843013cee7a55751789b1ba1bc1.zip | |
use option tty7 to force X server to be on tty7 (instead of opening tty5 and
tty6 so that the next available tty is tty7)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index c054ff704..026ee1742 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -38,16 +38,13 @@ sub new($$) { install_gtk::createXconf($f, @{$o->{mouse}}{"XMOUSETYPE", "device"}, $o->{mouse}{wacom}[0]); devices::make("/dev/kbd"); - local *T1; open T1, ">/dev/tty5"; - local *T2; open T2, ">/dev/tty6"; - my $launchX = sub { my $ok = 1; my $xpmac_opts = cat_("/proc/cmdline"); unless (-d "/var/log") { mkdir("/var/log") } local $SIG{CHLD} = sub { $ok = 0 if waitpid(-1, c::WNOHANG()) > 0 }; unless (fork()) { - exec $_[0], (arch() =~ /^sparc/ || arch() eq "ppc" ? () : "-kb"), "-dpms", "-s", "240", + exec $_[0], (arch() =~ /^sparc/ || arch() eq "ppc" ? () : "-kb"), 'tty7', "-dpms", "-s", "240", ($_[0] =~ /Xpmac/ ? $xpmac_opts !~ /ofonly/ ? ("-mode", "17", "-depth", "32") : "-mach64" : ()), ($_[0] =~ /Xsun/ || $_[0] =~ /Xpmac/ ? ("-fp", "/usr/X11R6/lib/X11/fonts:unscaled") : ("-allowMouseOpenFail", "-xf86config", $f)) or exit 1; |