diff options
| -rw-r--r-- | .cvsignore | 4 | ||||
| -rw-r--r-- | Makefile | 5 | ||||
| -rwxr-xr-x | make_boot_img | 9 | ||||
| -rw-r--r-- | perl-install/ChangeLog | 8 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 4 | ||||
| -rw-r--r-- | perl-install/share/list.alpha | 2 | ||||
| -rw-r--r-- | tools/alpha/cd/Makefile | 4 | ||||
| -rw-r--r-- | tools/alpha/cd/README | 37 | ||||
| -rw-r--r-- | tools/alpha/cd/aboot.cnf | 3 |
9 files changed, 64 insertions, 12 deletions
diff --git a/.cvsignore b/.cvsignore index cb333fb93..2541d16e3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,11 +1,11 @@ -kernel +kernel* pictures docs unused *.img *.rdz modules -vmlinuz +vmlinu* install_pcmcia_modules System.map @@ -31,6 +31,11 @@ AUTOBOOT = $(ROOTDEST)/dosutils/autoboot/mdkinst install: build autoboot for i in images misc Mandrake Mandrake/base; do install -d $(ROOTDEST)/$$i ; done cp -f $(RELEASE_BOOT_IMG) $(ROOTDEST)/images +ifeq (alpha,$(ARCH)) + cp -f $(BOOT_RDZ) $(ROOTDEST)/boot + cp -f vmlinux.gz $(ROOTDEST)/boot/instboot.gz + make -C tools/$(ARCH)/cd install ROOTDEST=$(ROOTDEST) +endif make -C perl-install full_stage2 build: $(BOOT_IMG) diff --git a/make_boot_img b/make_boot_img index 6b137b826..2ea53fc24 100755 --- a/make_boot_img +++ b/make_boot_img @@ -109,24 +109,21 @@ label rescue sub boot_img_alpha { my ($mnt, $img) = @_; - my $sizek = int ((-s "vmlinux.gz") / 1024 + 130); __ "$sudo umount $mnt 2>/dev/null"; - _ "dd if=/dev/zero of=$img bs=1k count=$sizek"; + _ "dd if=/dev/zero of=$img bs=1k count=1440"; _ "$mke2fs $img"; _ "/sbin/e2writeboot $img /boot/bootlx"; _ "$sudo mount -t ext2 $img $mnt -o loop"; _ "cp -f vmlinux.gz $mnt"; - -f "$type.rdz" or initrd("${mnt}2", "$type.rdz"); + -f "$type.rdz" ? _ "cp -f $type.rdz $mnt" : initrd("${mnt}2", "$mnt/$type.rdz"); mkdir "$mnt/etc", 0777; output("$mnt/etc/aboot.conf", -"0:vmlinux.gz load_ramdisk=1 prompt_ramdisk=0 ramdisk_start=$sizek root=/dev/fd0 mdkinst rw ramdisk=32000 +"0:vmlinux.gz initrd=$type.rdz mdkinst rw ramdisk=32000 "); _ "sync"; _ "df $mnt"; - __ "$sudo umount $mnt 2>/dev/null"; - _ "cat $type.rdz >> $img"; } sub boot_img_sparc { diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 714758bd8..21fa10787 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,11 @@ +2000-02-18 Pixel <pixel@mandrakesoft.com> + + * install_steps_gtk.pm (createXconf): added /dev/ (X wants + "/dev/psaux" and not "psaux") + + * diskdrake.pm (Create): show start sector even for non-expert on + non-i386 + 2000-02-16 Pixel <pixel@mandrakesoft.com> * mouse.pm (detect): add defaults to serial mouse diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index cd08affd1..8a20550f9 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -191,7 +191,7 @@ sub new($$) { 0; }; my @servers = qw(FBDev VGA16); #-) - @servers = qw(FBDev 3DLabs TGA) if arch() eq "alpha"; + @servers = qw(3DLabs) if arch() eq "alpha"; @servers = qw(Mach64) if arch() =~ /^sparc/; foreach (@servers) { @@ -838,7 +838,7 @@ EndSection Section "Pointer" Protocol "$mouse_type" - Device "$mouse_dev" + Device "/dev/$mouse_dev" Emulate3Buttons Emulate3Timeout 50 EndSection diff --git a/perl-install/share/list.alpha b/perl-install/share/list.alpha index ed7935822..efabaecbb 100644 --- a/perl-install/share/list.alpha +++ b/perl-install/share/list.alpha @@ -1,4 +1,2 @@ /usr/X11R6/bin/XF86_3DLabs -/usr/X11R6/bin/XF86_FBDev -/usr/X11R6/bin/XF86_TGA /usr/X11R6/bin/xmodmap diff --git a/tools/alpha/cd/Makefile b/tools/alpha/cd/Makefile new file mode 100644 index 000000000..c5235660b --- /dev/null +++ b/tools/alpha/cd/Makefile @@ -0,0 +1,4 @@ +install: + cp -f README $(ROOTDEST) + install -d $(ROOTDEST)/etc + cp -f aboot.cnf $(ROOTDEST)/etc diff --git a/tools/alpha/cd/README b/tools/alpha/cd/README new file mode 100644 index 000000000..98dc50fda --- /dev/null +++ b/tools/alpha/cd/README @@ -0,0 +1,37 @@ +!! beta version !! + +Mandrake Alpha short Howto-Install : + +* to install from the cdrom: + +- either boot on the cdrom: + - in SRM, find the device name corresponding to the cdrom (`show device' can help) + - enter `boot dqa0 -fl 0' (replacing dqa0 by the cdrom device) + +- or you can boot on a floppy: + - first create a boot floppy from images/cdrom.img + - in SRM, find the device name corresponding to the floppy (`show device' can help) + - enter `boot dva0 -fl 0' (replacing dva0 by the floppy device) + - fulfill the install. + +* on reboot: + +- either enter `boot XXXX -fl 0' where XXXX is the device where you installed +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) + + +* to install from the network: + +Same as for the cdrom install, except give `boot dqa0 -fl 1' or boot on +images/network.img floppy (with `boot dva0 -fl 0') + + + + Alpha Team. + +Reports problems to Chmouel Boudjnah <chmouel@mandrakesoft.com> or Pixel +<pixel@mandrakesoft.com>. diff --git a/tools/alpha/cd/aboot.cnf b/tools/alpha/cd/aboot.cnf new file mode 100644 index 000000000..4ddaaf949 --- /dev/null +++ b/tools/alpha/cd/aboot.cnf @@ -0,0 +1,3 @@ +0:boot/instboot.gz initrd=boot/cdrom.rdz mdkinst rw ramdisk=32000 +1:boot/instboot.gz initrd=boot/network.rdz mdkinst rw ramdisk=32000 +2:boot/instboot.gz initrd=boot/hd.rdz mdkinst rw ramdisk=32000 |