switched to syslinux

6 files changed, 13 insertions, 52 deletions

diff --git a/Makefile b/Makefile
index 3f0d87f..2b6023a 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ step5: gpm perl
 	
 directory-layout:
 	cd target && mkdir bin boot dev etc home lib mnt root sbin tmp usr var proc sys
-	cd target/boot && mkdir syslinux
+	cd target/boot && mkdir extlinux
 	cd target/var && mkdir lock log run spool
 	cd target/usr && mkdir bin include lib local sbin share src
 	cd target/usr/share && mkdir man
@@ -98,8 +98,7 @@ disk-image:
 	chmod 666 minilinux.img
 	/sbin/losetup /dev/loop0 minilinux.img
 	dd if=/dev/zero of=/dev/loop0 bs=512 count=32130
-	dd if=mbr of=/dev/loop0 bs=512 count=1
-	echo ',2,L' | /sbin/sfdisk -H 255 -S 63 -C 2 --no-reread /dev/loop0
+	echo ',2,L,*' | /sbin/sfdisk -H 255 -S 63 -C 2 --no-reread /dev/loop0
 	sync && sleep 1
 	/sbin/losetup -d /dev/loop0
 	/sbin/losetup -o 512 /dev/loop0 minilinux.img
@@ -112,35 +111,14 @@ disk-image:
 
 syslinux:
 	tar jxf tarballs/syslinux-$(SYSLINUX_VERSION).tar.gz
-#	mkdir grub-build && cd grub-build && ../grub-$(GRUB_VERSION)/configure --prefix=`pwd`
-#	cd grub-build && make $(PARALLEL)
-#	cd grub-build && make install
-#	cp grub-build/boot.img target/boot/grub/
-#	cp grub.cfg target/boot/grub
+	cd syslinux-$(SYSLINUX_VERSION) && make $(PARALLEL)
+	syslinux-$(SYSLINUX_VERSION)/extlinux/extlinux -i target/boot/extlinux/.
+	cp extlinux.conf target/boot/extlinux/.
 
 syslinux-loader:
-#	-umount target
-#	-mknod /dev/loop0 b 7 0 
-#	-mknod /dev/loop1 b 7 0 
-#	-/sbin/losetup -d /dev/loop0
-#	-/sbin/losetup -d /dev/loop1
-#	/sbin/losetup -o 512 /dev/loop1 minilinux.img
-#	mount /dev/loop1 target
-#	ln -s /dev/loop1 /dev/loop0p1
-#	/sbin/losetup /dev/loop0 minilinux.img
-#	grub-build/bin/grub-mkimage -o core.img -v
-#	cp core.img /boot/grub
-#	cp core.img target/boot/grub
-#	grub-build/sbin/grub-setup -v \
-#		-b ../../`pwd`/grub-build/boot.img \
-#		-r '(hd0,1)' -m devices.map '(hd0)' --force
-#	umount target
-#	/sbin/losetup -d /dev/loop0
-#	/sbin/losetup -d /dev/loop1
-#	rm -f /dev/loop0p1
-#	rm -f /boot/grub/core.img
-#	/sbin/losetup -o 512 /dev/loop0 minilinux.img
-#	mount /dev/loop0 target
+	/sbin/losetup /dev/loop1 minilinux.img
+	cat syslinux-3.86/mbr/mbr.bin > /dev/loop1
+	/sbin/losetup -d /dev/loop1
 
 syslinux-clean:
 	-rm -rf syslinux-build
diff --git a/devices.map b/devices.map
deleted file mode 100644
index 71a7c4d..0000000
--- a/devices.map
+++ /dev/null
@@ -1,2 +0,0 @@
-(hd0)   /dev/loop0
-(hd0,1)	/dev/loop1
diff --git a/extlinux.conf b/extlinux.conf
new file mode 100644
index 0000000..38fe434
--- /dev/null
+++ b/extlinux.conf
@@ -0,0 +1,5 @@
+DEFAULT minilinux
+LABEL minilinux
+SAY Booting Minilinux...
+KERNEL /boot/bzImage-2.6.33.3
+APPEND root=/dev/hda1 ro
diff --git a/grub.cfg b/grub.cfg
deleted file mode 100644
index 94c37ca..0000000
--- a/grub.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-# GRUB2 config file
-
-# boot fast, nobody has to edit boot options here!
-#set timeout=0
-set timeout=5
-
-# by default, boot first entry
-set default=0
-
-# hide menu per default
-#hiddenmenu
-
-# boot minilinux
-menuentry "Minilinux" {
-	set root=(hd0,1)
-	linux /boot/bzImage-2.6.33.3 root=/dev/hda1
-}
diff --git a/grub.install b/grub.install
deleted file mode 100644
index 02c1c5d..0000000
--- a/grub.install
+++ /dev/null
@@ -1,3 +0,0 @@
-rootnoverify (hd0,0)
-setup (hd0)
-quit
diff --git a/mbr b/mbr
deleted file mode 100644
index 6f2016c..0000000
--- a/mbr
+++ /dev/null