summaryrefslogtreecommitdiff
path: root/default-config/boot/grub
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-09-28 02:15:25 +0000
committerAaron Griffin <aaron@archlinux.org>2006-09-28 02:15:25 +0000
commitc464db595165a847e5fc81a57133f68a9c2e0ef8 (patch)
tree6419418b51e45d275e5d3ccf0a61dc3ae0697131 /default-config/boot/grub
parent59ddc5be61a1ee5dadc32c8a2255931d62bbce2a (diff)
downloadarchiso32-c464db595165a847e5fc81a57133f68a9c2e0ef8.tar.xz
git-svn-id: http://phraktured.net/archiso@13 00a9fe69-e71b-0410-bb23-df0e5024db41
Diffstat (limited to 'default-config/boot/grub')
-rw-r--r--default-config/boot/grub/help.lst9
-rw-r--r--default-config/boot/grub/menu.lst16
-rw-r--r--default-config/boot/grub/tools.lst16
3 files changed, 12 insertions, 29 deletions
diff --git a/default-config/boot/grub/help.lst b/default-config/boot/grub/help.lst
index 623e7c1..b9468eb 100644
--- a/default-config/boot/grub/help.lst
+++ b/default-config/boot/grub/help.lst
@@ -14,12 +14,3 @@ pause Press enter to continue...
title HOW-TO: Do some other shit
cat /boot/help/othershit.txt
pause Press enter to continue...
-
-title MANUAL: Grub
-cat /boot/help/grub.txt
-pause Press enter to continue...
-
-title MANUAL: Lilo
-cat /boot/help/lilo.txt
-pause Press enter to continue...
-
diff --git a/default-config/boot/grub/menu.lst b/default-config/boot/grub/menu.lst
index 2edc59a..f25c9fe 100644
--- a/default-config/boot/grub/menu.lst
+++ b/default-config/boot/grub/menu.lst
@@ -8,18 +8,18 @@ title Boot ArchLive
kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75%
initrd /boot/archlive.img
-title Shutdown the Computer
-halt
-
-title Reboot the Computer
-reboot
-
title Tools...
-configgile /boot/grub/tools.lst
+configfile /boot/grub/tools.lst
title View Help...
configfile /boot/grub/help.lst
-
title More Options...
configfile /boot/grub/more.lst
+
+title Shutdown the Computer
+halt
+
+title Reboot the Computer
+reboot
+
diff --git a/default-config/boot/grub/tools.lst b/default-config/boot/grub/tools.lst
index 583ee4b..ef7cabc 100644
--- a/default-config/boot/grub/tools.lst
+++ b/default-config/boot/grub/tools.lst
@@ -9,27 +9,19 @@ configfile /boot/grub/menu.lst
title Run memtest86+ (Memory Testing)
kernel /boot/memtest86+/memtest.bin
-# TODO package
# http://www.vortex.prodigynet.co.uk/x86test/
title Run x86test (CPU Info)
-kernel /boot/x86test.img
+kernel /boot/x86test_zImage.bin
+#wget http://www.vortex.prodigynet.co.uk/x86test/x86test_zImage.bin
-# TODO package
# http://home.san.rr.com/johninsd/pub/linux/lilo/boot/
-title LILO Diagnostic 1 (diag1)
-kernel /boot/lilo_diagnostic1.img
-
-title LILO Diagnostic 2 (diag1)
-kernel /boot/lilo_diagnostic2.img
+title LILO Diagnostic
+kernel /boot/diag2.img
title Install GRUB to hd0 MBR
root (hd0,0)
setup (hd0)
-title Install GRUB to hd1 MBR
-root (hd1,0)
-setup (hd1)
-
# http://www.erikyyy.de/invaders/
title Space Invaders!!
kernel /boot/invaders.img