diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:05:14 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:05:14 +0200 |
| commit | 615360e7ad327a88578dcaea7d0d677c840c94fb (patch) | |
| tree | 360ca9a49f3d82d589a4b49c98e5210dfcb3b74e /templates | |
| parent | ae5c245c5d0b910b9fde27f99668c46f64f9bcc2 (diff) | |
| download | vyos-live-build-615360e7ad327a88578dcaea7d0d677c840c94fb.tar.gz vyos-live-build-615360e7ad327a88578dcaea7d0d677c840c94fb.zip | |
Adding live-helper 1.0~a18-1.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/grub/menu.lst | 6 | ||||
| -rw-r--r-- | templates/syslinux/pxelinux.cfg | 27 | ||||
| -rw-r--r-- | templates/syslinux/syslinux.cfg (renamed from templates/syslinux/isolinux.cfg) | 0 | ||||
| -rw-r--r-- | templates/yaboot/boot.msg | 2 | ||||
| -rw-r--r-- | templates/yaboot/yaboot.conf | 6 |
5 files changed, 8 insertions, 33 deletions
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/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/isolinux.cfg b/templates/syslinux/syslinux.cfg index 733a5ebdb..733a5ebdb 100644 --- a/templates/syslinux/isolinux.cfg +++ b/templates/syslinux/syslinux.cfg 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 |