summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:05:09 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:18:29 +0100
commit97c3a13dcc9becf93cb7c2aa89ea3e00f06b9179 (patch)
treed7facbbbf53b1a5bc0fa92f671f5b1e29a7e3200 /templates
parent7c68e6ebca01f64501453fa53941ac77b9c2c335 (diff)
downloadlive-build-97c3a13dcc9becf93cb7c2aa89ea3e00f06b9179.zip
live-build-97c3a13dcc9becf93cb7c2aa89ea3e00f06b9179.tar.gz
Adding live-helper 1.0~a10-1.
Diffstat (limited to 'templates')
-rw-r--r--templates/grub/menu.lst4
-rw-r--r--templates/syslinux/isolinux.cfg4
-rw-r--r--templates/syslinux/pxelinux.cfg10
-rw-r--r--templates/yaboot/yaboot.conf4
4 files changed, 11 insertions, 11 deletions
diff --git a/templates/grub/menu.lst b/templates/grub/menu.lst
index 22355b8..efa0d82 100644
--- a/templates/grub/menu.lst
+++ b/templates/grub/menu.lst
@@ -2,6 +2,6 @@ default 0
color cyan/blue white/blue
splashimage /boot/grub/splash.xpm.gz
-LIVE_KERNEL_LIVE
+LIVE_LINUX_LIVE
-LIVE_KERNEL_INSTALL
+LIVE_LINUX_INSTALL
diff --git a/templates/syslinux/isolinux.cfg b/templates/syslinux/isolinux.cfg
index c44e657..571914a 100644
--- a/templates/syslinux/isolinux.cfg
+++ b/templates/syslinux/isolinux.cfg
@@ -14,9 +14,9 @@ F0 f10.txt
DEFAULT live
-LIVE_KERNEL_LIVE
+LIVE_LINUX_LIVE
-LIVE_KERNEL_INSTALL
+LIVE_LINUX_INSTALL
LIVE_MEMTEST
diff --git a/templates/syslinux/pxelinux.cfg b/templates/syslinux/pxelinux.cfg
index 8b138c4..379414c 100644
--- a/templates/syslinux/pxelinux.cfg
+++ b/templates/syslinux/pxelinux.cfg
@@ -1,19 +1,19 @@
default live
label live
kernel vmlinuz
- append initrd=initrd.img boot=casper netboot nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
+ 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_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
+ 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_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
+ 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_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
+ 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_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
+ 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
diff --git a/templates/yaboot/yaboot.conf b/templates/yaboot/yaboot.conf
index 8170d70..12a7dff 100644
--- a/templates/yaboot/yaboot.conf
+++ b/templates/yaboot/yaboot.conf
@@ -1,6 +1,6 @@
default=live
message=/install/boot.msg
-LIVE_KERNEL_LIVE
+LIVE_LINUX_LIVE
-LIVE_KERNEL_INSTALL
+LIVE_LINUX_INSTALL