summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-07-29 04:59:06 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-07-29 04:59:06 +0000
commit62ad041ccd3ea4750ce1f63fde3bf6a86bac0f38 (patch)
tree5dea389df262d58145b830130599fd33480303fe
parent9560c4c6065904a4d98e8075b13fdc28b1d6829b (diff)
downloaddrakx-62ad041ccd3ea4750ce1f63fde3bf6a86bac0f38.tar
drakx-62ad041ccd3ea4750ce1f63fde3bf6a86bac0f38.tar.gz
drakx-62ad041ccd3ea4750ce1f63fde3bf6a86bac0f38.tar.bz2
drakx-62ad041ccd3ea4750ce1f63fde3bf6a86bac0f38.tar.xz
drakx-62ad041ccd3ea4750ce1f63fde3bf6a86bac0f38.zip
merge in globetrotter changes
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/install_steps_gtk.pm2
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';