From 75085b969b939ac9ca5ebdf1fe7c36ea4a36b8f5 Mon Sep 17 00:00:00 2001
From: Stew Benedict <stewb@mandriva.org>
Date: Wed, 14 Mar 2001 21:45:42 +0000
Subject: fix bootstrap partition creation/tracking allow Xpmac to launch in 2
 modes based on cmdline

---
 perl-install/install_steps_gtk.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'perl-install/install_steps_gtk.pm')

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;
 		}
-- 
cgit v1.2.1