From 62ad041ccd3ea4750ce1f63fde3bf6a86bac0f38 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 29 Jul 2005 04:59:06 +0000 Subject: merge in globetrotter changes --- perl-install/install2.pm | 2 +- perl-install/install_steps_gtk.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 77a113c35..0d497bce7 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -190,7 +190,7 @@ sub formatPartitions { devices::make("$o->{prefix}/dev/null"); chmod 0666, "$o->{prefix}/dev/null"; - eval { fs::mount('none', "$o->{prefix}/proc", 'proc') }; + eval { fs::mount('none', "$o->{prefix}/proc", 'proc') } if !$::globetrotter; eval { fs::mount('none', "$o->{prefix}/sys", 'sysfs') }; eval { fs::mount_usbfs($o->{prefix}) }; diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 8ef0d9bb7..bc42010d1 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -101,7 +101,7 @@ sub new($$) { } else { @servers = qw(Xsun24); } - } elsif (arch() =~ /ia64/) { + } elsif (arch() =~ /ia64/ || $::globetrotter) { require Xconfig::card; my ($card) = Xconfig::card::probe(); @servers = map { if_($_, "Driver:$_") } $card && $card->{Driver}, 'fbdev'; -- cgit v1.2.1