diff options
| author | Stew Benedict <stewb@mandriva.org> | 2001-03-14 21:45:42 +0000 |
|---|---|---|
| committer | Stew Benedict <stewb@mandriva.org> | 2001-03-14 21:45:42 +0000 |
| commit | 75085b969b939ac9ca5ebdf1fe7c36ea4a36b8f5 (patch) | |
| tree | cc1990314a60d37bd1d3b12b0dcb29fcb5f99892 /perl-install/install_steps_gtk.pm | |
| parent | 5889d46fd238fbf99b0e7c52360466e7b9f086ce (diff) | |
| download | drakx-75085b969b939ac9ca5ebdf1fe7c36ea4a36b8f5.tar drakx-75085b969b939ac9ca5ebdf1fe7c36ea4a36b8f5.tar.gz drakx-75085b969b939ac9ca5ebdf1fe7c36ea4a36b8f5.tar.bz2 drakx-75085b969b939ac9ca5ebdf1fe7c36ea4a36b8f5.tar.xz drakx-75085b969b939ac9ca5ebdf1fe7c36ea4a36b8f5.zip | |
fix bootstrap partition creation/tracking
allow Xpmac to launch in 2 modes based on cmdline
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 8b6e623a2..cdd84d41b 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -47,10 +47,11 @@ sub new($$) { my $launchX = sub { my $ok = 1; + my $xpmac_opts = cat_("/proc/cmdline"); 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", - ($_[0] =~ /Xpmac/ ? ("-mode", "17", "-depth", "32") : ()), + ($_[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; } |