From 97c3a13dcc9becf93cb7c2aa89ea3e00f06b9179 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 23 Sep 2007 10:05:09 +0200 Subject: Adding live-helper 1.0~a10-1. --- templates/grub/menu.lst | 4 ++-- templates/syslinux/isolinux.cfg | 4 ++-- templates/syslinux/pxelinux.cfg | 10 +++++----- templates/yaboot/yaboot.conf | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'templates') diff --git a/templates/grub/menu.lst b/templates/grub/menu.lst index 22355b84d..efa0d822f 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 c44e6576e..571914a88 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 8b138c48b..379414ca3 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 8170d7046..12a7dff28 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 -- cgit v1.2.3