From 8c80180a73016a490bee63124139cdbabf28ba35 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Wed, 2 Jun 2004 21:10:19 +0000 Subject: [PATCH] Correct ramdisk management --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 62f398a..75f4371 100644 --- a/Makefile +++ b/Makefile @@ -25,23 +25,25 @@ FILE=file -bknL KERNEL_ARCH=$(filter Motorola PowerPC, $(shell $(FILE) $(KERNEL) | cut -d"," -f 2)) KERNEL_SIZE=$(shell ls -l $(KERNEL) | awk '{print $$5}') -RAMDISK=$(basename $(shell ls ramdisk 2> /dev/null)) +RAMDISK=$(shell ls ramdisk.gz 2> /dev/null) all: floppy.img floppy.img: tools first/first vmlinuz second/second $(RAMDISK) -ifeq ($(RAMDISK),ramdisk) +ifeq ($(RAMDISK),ramdisk.gz) tools/emile-install -f first/first -s second/second \ -i vmlinuz -b $(KERNEL_SIZE) \ -r $(RAMDISK) \ floppy.img.X + tools/emile-set-cmdline floppy.img.X \ + "root=/dev/ramdisk ramdisk_size=2048" else tools/emile-install -f first/first -s second/second \ -i vmlinuz -b $(KERNEL_SIZE) \ floppy.img.X -endif tools/emile-set-cmdline floppy.img.X \ "root=/dev/nfs ip=dhcp nfsroot=192.168.100.1:/mnt/usb-storage/nfsroot" +endif mv floppy.img.X floppy.img vmlinux.bin: $(KERNEL)