From 0d5ff4ca7596790f853cf637e0fe225cad810a76 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:05:14 +0200
Subject: Adding live-helper 1.0~a18-1.

---
 templates/grub/menu.lst         |  6 ++++--
 templates/syslinux/isolinux.cfg | 36 ------------------------------------
 templates/syslinux/pxelinux.cfg | 27 ---------------------------
 templates/syslinux/syslinux.cfg | 36 ++++++++++++++++++++++++++++++++++++
 templates/yaboot/boot.msg       |  2 +-
 templates/yaboot/yaboot.conf    |  6 +++---
 6 files changed, 44 insertions(+), 69 deletions(-)
 delete mode 100644 templates/syslinux/isolinux.cfg
 delete mode 100644 templates/syslinux/pxelinux.cfg
 create mode 100644 templates/syslinux/syslinux.cfg

(limited to 'templates')

diff --git a/templates/grub/menu.lst b/templates/grub/menu.lst
index efa0d822f..3b866e5c7 100644
--- a/templates/grub/menu.lst
+++ b/templates/grub/menu.lst
@@ -2,6 +2,8 @@ default 0
 color cyan/blue white/blue
 splashimage /boot/grub/splash.xpm.gz
 
-LIVE_LINUX_LIVE
+LINUX_LIVE
 
-LIVE_LINUX_INSTALL
+LINUX_INSTALL
+
+MEMTEST
diff --git a/templates/syslinux/isolinux.cfg b/templates/syslinux/isolinux.cfg
deleted file mode 100644
index 733a5ebdb..000000000
--- a/templates/syslinux/isolinux.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-
-DISPLAY boot.txt
-
-F1 f1.txt
-F2 f2.txt
-F3 f3.txt
-F4 f4.txt
-F5 f5.txt
-F6 f6.txt
-F7 f7.txt
-F8 f8.txt
-F9 f9.txt
-F0 f10.txt
-
-DEFAULT live
-
-LINUX_LIVE
-
-LINUX_INSTALL
-
-MEMTEST
-
-#LABEL floppy
-#	localboot 0x00
-
-#LABEL disk1
-#	localboot 0x80
-
-#LABEL disk2
-#	localboot 0x81
-
-#LABEL nextboot
-#	localboot -1
-
-PROMPT 1
-TIMEOUT 0
diff --git a/templates/syslinux/pxelinux.cfg b/templates/syslinux/pxelinux.cfg
deleted file mode 100644
index 379414ca3..000000000
--- a/templates/syslinux/pxelinux.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-default live
-label live
-  kernel vmlinuz
-  append initrd=initrd.img boot=casper netboot nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
-label nfs
-  kernel vmlinuz
-  append initrd=initrd.img boot=casper netboot=nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
-label nfslegacy
-  kernel vmlinuz
-  append initrd=initrd.img boot=casper root=/dev/nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
-label cifs
-  kernel vmlinuz
-  append initrd=initrd.img boot=casper netboot=cifs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
-label cifslegacy
-  kernel vmlinuz
-  append initrd=initrd.img boot=casper root=/dev/cifs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
-label memtest
-  kernel memtest
-display pxelinux.cfg/isolinux.txt
-timeout 0
-prompt 1
-F1 pxelinux.cfg/f1.txt
-F3 pxelinux.cfg/f3.txt
-F4 pxelinux.cfg/f4.txt
-F8 pxelinux.cfg/f8.txt
-F9 pxelinux.cfg/f9.txt
-F0 pxelinux.cfg/f10.txt
diff --git a/templates/syslinux/syslinux.cfg b/templates/syslinux/syslinux.cfg
new file mode 100644
index 000000000..733a5ebdb
--- /dev/null
+++ b/templates/syslinux/syslinux.cfg
@@ -0,0 +1,36 @@
+
+DISPLAY boot.txt
+
+F1 f1.txt
+F2 f2.txt
+F3 f3.txt
+F4 f4.txt
+F5 f5.txt
+F6 f6.txt
+F7 f7.txt
+F8 f8.txt
+F9 f9.txt
+F0 f10.txt
+
+DEFAULT live
+
+LINUX_LIVE
+
+LINUX_INSTALL
+
+MEMTEST
+
+#LABEL floppy
+#	localboot 0x00
+
+#LABEL disk1
+#	localboot 0x80
+
+#LABEL disk2
+#	localboot 0x81
+
+#LABEL nextboot
+#	localboot -1
+
+PROMPT 1
+TIMEOUT 0
diff --git a/templates/yaboot/boot.msg b/templates/yaboot/boot.msg
index 14132841a..8fc17b04c 100644
--- a/templates/yaboot/boot.msg
+++ b/templates/yaboot/boot.msg
@@ -7,7 +7,7 @@ The default option is 'live'.
 
 If the system fails to boot at all (the typical
 symptom is a white screen which doesn't go away),
-use 'live video=ofonly'.
+append 'video=ofonly' or use 'live-failsafe'.
 
 The plain options are for the powerpc family of
 processors (from 601 to G4). The *64 options are for
diff --git a/templates/yaboot/yaboot.conf b/templates/yaboot/yaboot.conf
index 050028cfc..2755d8905 100644
--- a/templates/yaboot/yaboot.conf
+++ b/templates/yaboot/yaboot.conf
@@ -1,6 +1,6 @@
 default=live
-message=/live/boot.msg
+message=/yaboot/boot.msg
 
-LIVE_LINUX_LIVE
+LINUX_LIVE
 
-LIVE_LINUX_INSTALL
+LINUX_INSTALL
-- 
cgit v1.2.3