Corrected DOS newlines... whoops

git-svn-id: http://phraktured.net/archiso@16 00a9fe69-e71b-0410-bb23-df0e5024db41

5 files changed, 75 insertions, 77 deletions

diff --git a/default-config/boot/grub/help.lst b/default-config/boot/grub/help.lst
index b9468eb..36a4ea3 100644
--- a/default-config/boot/grub/help.lst
+++ b/default-config/boot/grub/help.lst
@@ -10,7 +10,3 @@ configfile /boot/grub/menu.lst
 title    HOW-TO: Boot an existing system
 cat /boot/help/bootexisting.txt
 pause Press enter to continue...
-
-title    HOW-TO: Do some other shit
-cat /boot/help/othershit.txt
-pause Press enter to continue...
diff --git a/default-config/boot/grub/menu.lst b/default-config/boot/grub/menu.lst
index f25c9fe..dac552a 100644
--- a/default-config/boot/grub/menu.lst
+++ b/default-config/boot/grub/menu.lst
@@ -1,25 +1,25 @@
-

-timeout 300

-default 0

-color light-blue/blue black/light-grey

-splashimage=/boot/splash.xpm.gz

-

-title  Boot ArchLive

-kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75%

-initrd /boot/archlive.img

-

-title Tools...

-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

-

+
+timeout 300
+default 0
+color light-blue/blue black/light-grey
+splashimage=/boot/splash.xpm.gz
+
+title  Boot ArchLive
+kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75%
+initrd /boot/archlive.img
+
+title Tools...
+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/more.lst b/default-config/boot/grub/more.lst
index a8450f3..9a2f165 100644
--- a/default-config/boot/grub/more.lst
+++ b/default-config/boot/grub/more.lst
@@ -10,8 +10,9 @@ title    Attempt existing Linux detection
 configfile /boot/grub/tryboot.lst
 
 title    [EDIT ME] Boot Existing Linux Install
-root   (hd0,1)
+root   (hd0,0)
 kernel /vmlinuz26 root=/dev/hda3 ro
+initrd /kernel26.img
 
 title    [EDIT ME] Boot Existing Windows Install
 rootnoverify (hd0,0)
diff --git a/default-config/boot/grub/tools.lst b/default-config/boot/grub/tools.lst
index ef7cabc..be30408 100644
--- a/default-config/boot/grub/tools.lst
+++ b/default-config/boot/grub/tools.lst
@@ -1,27 +1,27 @@
-timeout 300

-default 0

-color light-blue/blue black/light-grey

-splashimage=/boot/splash.xpm.gz

-

-title << Back to Main Menu

-configfile /boot/grub/menu.lst

-

-title    Run memtest86+ (Memory Testing)

-kernel /boot/memtest86+/memtest.bin

-

-# http://www.vortex.prodigynet.co.uk/x86test/

-title    Run x86test (CPU Info)

-kernel /boot/x86test_zImage.bin

-#wget http://www.vortex.prodigynet.co.uk/x86test/x86test_zImage.bin

-

-# http://home.san.rr.com/johninsd/pub/linux/lilo/boot/

-title    LILO Diagnostic

-kernel /boot/diag2.img

-

-title    Install GRUB to hd0 MBR

-root  (hd0,0)

-setup (hd0)

-

-# http://www.erikyyy.de/invaders/

-title    Space Invaders!!

-kernel /boot/invaders.img

+timeout 300
+default 0
+color light-blue/blue black/light-grey
+splashimage=/boot/splash.xpm.gz
+
+title << Back to Main Menu
+configfile /boot/grub/menu.lst
+
+title    Run memtest86+ (Memory Testing)
+kernel /boot/memtest86+/memtest.bin
+
+# http://www.vortex.prodigynet.co.uk/x86test/
+title    Run x86test (CPU Info)
+kernel /boot/x86test_zImage.bin
+#wget http://www.vortex.prodigynet.co.uk/x86test/x86test_zImage.bin
+
+# http://home.san.rr.com/johninsd/pub/linux/lilo/boot/
+title    LILO Diagnostic
+kernel /boot/diag2.img
+
+title    Install GRUB to hd0 MBR
+root  (hd0,0)
+setup (hd0)
+
+# http://www.erikyyy.de/invaders/
+title    Space Invaders!!
+kernel /boot/invaders.img
diff --git a/default-config/boot/help/bootexisting.txt b/default-config/boot/help/bootexisting.txt
index 1c27625..540e41f 100644
--- a/default-config/boot/help/bootexisting.txt
+++ b/default-config/boot/help/bootexisting.txt
@@ -1,23 +1,24 @@
-This is a helpfile
-
-Hopefully grub will make this happy....
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+HOWTO: Boot an existing install
+
+Select "More Options" from the main menu.
+Move the cursor to "[EDIT ME] Boot an existing linux install"
+Press "e"
+
+At this point you will see the following:
+     root   (hd0,0)
+     kernel /vmlinuz26 root=/dev/hda3 ro
+     initrd /kernel26.img
+
+This needs to be changed to accomodate your hardware.
+
+The first line should be changed to indicate where your boot medium resides.
+  "(hd0,0)" is the first partition on the first hard drive (hda1) - change these
+  numbers to indicate the partition containing your /boot directory.
+  
+The second line should be changed to point to your kernel.  If the line above
+points to a partition _only_ containing /boot, then /vmlinuz26 is fine.
+Otherwise, change this to /boot/vmlinuz.  root= should be changed to match the
+partition for your root filesystem.  Other kernel parameters can be added here.