diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:04:49 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:18:29 +0100 |
| commit | da353a5231ad925013d01065768864307c70651a (patch) | |
| tree | 589606906e4e8966797f352ec63162cbb4016da0 /templates | |
| parent | 068a51b175546dfeac45c747236817cb41db50d7 (diff) | |
| download | live-build-da353a5231ad925013d01065768864307c70651a.zip live-build-da353a5231ad925013d01065768864307c70651a.tar.gz | |
Adding live-helper 1.0~a4-1.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/grub/menu.lst | 27 | ||||
| -rw-r--r-- | templates/syslinux/isolinux.cfg | 5 | ||||
| -rw-r--r-- | templates/syslinux/pxelinux.cfg | 14 |
3 files changed, 18 insertions, 28 deletions
diff --git a/templates/grub/menu.lst b/templates/grub/menu.lst index 843a135..30100ef 100644 --- a/templates/grub/menu.lst +++ b/templates/grub/menu.lst @@ -16,7 +16,7 @@ default 0 ## timeout sec # Set a timeout, in SEC seconds, before automatically booting the default entry # (normally the first entry defined). -timeout 1 +#timeout 5 # Pretty colours color cyan/blue white/blue @@ -59,11 +59,11 @@ color cyan/blue white/blue ## e.g. kopt=root=/dev/hda1 ro ## kopt_2_6_8=root=/dev/hdc1 ro ## kopt_2_6_8_2_686=root=/dev/hdc2 ro -# kopt=CDLABEL=Debian-Live rootfstype=iso9660 ro +# kopt=root=/dev/hda1 ro ## default grub root device ## e.g. groot=(hd0,0) -# groot=(hd0,4) +# groot=(hd0,0) ## should update-grub create alternative automagic boot options ## e.g. alternative=true @@ -115,21 +115,10 @@ color cyan/blue white/blue ## ## End Default Options ## -title Debian Live (default) -root (cd) -kernel /boot/vmlinuz root=CDLABEL=Debian-Live rootfstype=iso9660 ro boot=casper -initrd /boot/initrd.img -savedefault - -title Debian Live (run from RAM) -root (cd) -kernel /boot/vmlinuz root=CDLABEL=Debian-Live rootfstype=iso9660 ro boot=casper toram -initrd /boot/initrd.img -savedefault - -title memtest86+ RAM tester -root (cd) -kernel /boot/memtest -savedefault +LIVE_SPLASH + +LIVE_KERNEL_LIVE + +LIVE_KERNEL_INSTALL ### END DEBIAN AUTOMAGIC KERNELS LIST diff --git a/templates/syslinux/isolinux.cfg b/templates/syslinux/isolinux.cfg index 905bbea..212f8d0 100644 --- a/templates/syslinux/isolinux.cfg +++ b/templates/syslinux/isolinux.cfg @@ -1,5 +1,6 @@ -default linux -LIVE_KERNEL +default live +LIVE_KERNEL_LIVE +LIVE_KERNEL_INSTALL LIVE_MEMTEST display isolinux.txt timeout 0 diff --git a/templates/syslinux/pxelinux.cfg b/templates/syslinux/pxelinux.cfg index 0a1ba53..8b138c4 100644 --- a/templates/syslinux/pxelinux.cfg +++ b/templates/syslinux/pxelinux.cfg @@ -1,19 +1,19 @@ -default linux -label linux +default live +label live kernel vmlinuz - append initrd=initrd.gz boot=casper netboot nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND + append initrd=initrd.img boot=casper netboot nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND label nfs kernel vmlinuz - append initrd=initrd.gz boot=casper netboot=nfs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND + append initrd=initrd.img boot=casper netboot=nfs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND label nfslegacy kernel vmlinuz - append initrd=initrd.gz 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_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND label cifs kernel vmlinuz - append initrd=initrd.gz boot=casper netboot=cifs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND + append initrd=initrd.img boot=casper netboot=cifs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND label cifslegacy kernel vmlinuz - append initrd=initrd.gz 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_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND label memtest kernel memtest display pxelinux.cfg/isolinux.txt |