From 24dda9b78fbe61e569bfb65818b823a4f65af87d Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 23 Feb 2000 12:57:37 +0000
Subject: no_comment

---
 Makefile                          | 12 ++++++------
 perl-install/install_steps_gtk.pm |  8 +++++++-
 perl-install/share/list           |  1 +
 tools/alpha/cd/README             |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 88ee6e013..c0c01a81e 100644
--- a/Makefile
+++ b/Makefile
@@ -34,12 +34,12 @@ install: build autoboot
 ifeq (alpha,$(ARCH))
 	cp -f $(BOOT_RDZ) $(ROOTDEST)/boot
 	cp -f vmlinux.gz $(ROOTDEST)/boot/instboot.gz
-	sudo install -d /mnt/loop
-	for i in $(ROOTDEST)/images/disks/*; do \
-	  sudo mount $$i /mnt/loop -o loop ;\
-	  sudo cp -f vmlinux.gz /mnt/loop ;\
-	  sudo umount $$i ;\
-	done
+#	 sudo install -d /mnt/loop
+#	 for i in $(ROOTDEST)/images/disks/*; do \
+#	   sudo mount $$i /mnt/loop -o loop ;\
+#	   sudo cp -f vmlinux.gz /mnt/loop ;\
+#	   sudo umount $$i ;\
+#	 done
 	make -C tools/$(ARCH)/cd install ROOTDEST=$(ROOTDEST)
 endif
 	make -C perl-install full_stage2
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 84bb2f057..b3564c3d6 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -193,7 +193,13 @@ sub new($$) {
 		0;
 	    };
 	    my @servers = qw(FBDev VGA16); #-)
-	    @servers = qw(SVGA 3DLabs TGA) if arch() eq "alpha";
+	    if (arch() eq "alpha") {
+		require Xconfigurator;
+		my $card = Xconfigurator::cardConfigurationAuto();
+		add2hash($card, Xconfigurator::cardName2card($card->{type})) if $card && $card->{type};
+		@servers = $card->{server} || "TGA";
+		#-@servers = qw(SVGA 3DLabs TGA) 
+	    }
 	    @servers = qw(Mach64) if arch() =~ /^sparc/;
 
 	    foreach (@servers) {
diff --git a/perl-install/share/list b/perl-install/share/list
index fe0578b7e..062af67c6 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -4,6 +4,7 @@
 /lib/libnss_files.so.2
 /lib/libnss_dns.so.2
 /lib/libresolv.so.2
+/lib/libresolv.so.2.1
 /etc/protocols
 /sbin/fdisk
 /sbin/insmod
diff --git a/tools/alpha/cd/README b/tools/alpha/cd/README
index 98dc50fda..ded90a252 100644
--- a/tools/alpha/cd/README
+++ b/tools/alpha/cd/README
@@ -20,8 +20,8 @@ Mandrake Alpha short Howto-Install :
 the system 
 
 - if the device is not available via SRM, use the
-cdrom: `boot -file boot/v.gz -root /dev/sda1' (replace sda1 by the
-root you installed on)
+cdrom: `boot dqa0 -file boot/v.gz -fl root=/dev/sda1' (replace sda1 by the
+root you installed on, and dqa0 by the cdrom device)
 
 
 * to install from the network:
-- 
cgit v1.2.1