From 6f053d8213b782acefdaac6a9ecf143c6f9e385b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 28 Jan 2000 01:05:35 +0000
Subject: no_comment

---
 perl-install/Makefile                     | 2 ++
 perl-install/fsedit.pm                    | 2 +-
 perl-install/install_steps_gtk.pm         | 2 +-
 perl-install/install_steps_interactive.pm | 2 +-
 perl-install/share/list                   | 2 --
 perl-install/share/list.alpha             | 1 +
 perl-install/share/list.i386              | 3 +++
 7 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/Makefile b/perl-install/Makefile
index 729c1d385..9507b36a5 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -131,7 +131,9 @@ endif
 #	echo -e '#!/bin/sh\n\nexec "/usr/bin/sh"' > $(DEST)/usr/bin/runinstall2
 #	chmod a+x $(DEST)/usr/bin/runinstall2
 
+ifeq (i386,$(ARCH))
 	tar xyC $(DEST) -f ../install/install1_pcmcia.$(ARCH).tar.bz2 ./etc/pcmcia
+endif
 
 	find $(DEST) -name CVS | xargs rm -rf
 
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 866993793..5997bcd0d 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -233,7 +233,7 @@ sub check_mntpoint {
 
     if ($part->{start} + $part->{size} > 1024 * $hd->cylinder_size() && arch() =~ /i386/) {
 	die "/boot ending on cylinder > 1024" if $mntpoint eq "/boot";
-	die     "/ ending on cylinder > 1024" if $mntpoint eq "/" && !has_mntpoint("/boot", $hds);
+#	die     "/ ending on cylinder > 1024" if $mntpoint eq "/" && !has_mntpoint("/boot", $hds);
     }
 }
 
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index a77333b21..d3b3954b4 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -199,7 +199,7 @@ sub new($$) {
 		my $dir = "/usr/X11R6/bin";
 		unless (-x "$dir/XF86_$_") {
 		    unlink $_ foreach glob_("$dir/XF86_*");
-		    local *F; open F, ">$dir/XF86_$_" or die '';
+		    local *F; open F, ">$dir/XF86_$_" or die "failed to write server: $!";
 		    local $/ = \ (16 * 1024);
 		    my $f = install_any::getFile("$dir/XF86_$_") or next;
 		    syswrite F, $_ foreach <$f>;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 0509028cf..c30e5d74b 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -933,7 +933,7 @@ sub setupBootloaderBefore {
 #------------------------------------------------------------------------------
 sub setupBootloader {
     my ($o) = @_;
-    if (arch() =~ /^i386/) {
+    if (arch() =~ /^alpha/) {
 	$o->ask_yesorno('', _("Do you want to use aboot?"), 1) or return;
 	$o->SUPER::setupBootloader;	
     } elsif (arch() =~ /^sparc/) {
diff --git a/perl-install/share/list b/perl-install/share/list
index a13ac6099..cd22b741a 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -6,11 +6,9 @@
 /lib/libresolv.so.2
 /etc/protocols
 /sbin/fdisk
-/sbin/ifport
 /sbin/insmod
 /sbin/mkraid
 /sbin/rmmod
-/sbin/mkdosfs
 /sbin/mke2fs
 /sbin/raidstart
 /usr/bin/bzip2
diff --git a/perl-install/share/list.alpha b/perl-install/share/list.alpha
index 4d30b1431..ed7935822 100644
--- a/perl-install/share/list.alpha
+++ b/perl-install/share/list.alpha
@@ -1,3 +1,4 @@
 /usr/X11R6/bin/XF86_3DLabs
+/usr/X11R6/bin/XF86_FBDev
 /usr/X11R6/bin/XF86_TGA
 /usr/X11R6/bin/xmodmap
diff --git a/perl-install/share/list.i386 b/perl-install/share/list.i386
index af684bd7b..7ef3bed87 100644
--- a/perl-install/share/list.i386
+++ b/perl-install/share/list.i386
@@ -1,2 +1,5 @@
+/sbin/ifport
+/sbin/mkdosfs
 /usr/X11R6/bin/XF86_FBDev
 /usr/X11R6/bin/XF86_VGA16
+/usr/X11R6/bin/xmodmap
-- 
cgit v1.2.1