diff options
author | Jesse Hathaway <jesse@mbuki-mvuki.org> | 2007-10-13 13:34:59 -0400 |
---|---|---|
committer | Jesse W. Hathaway <lollipop@lifesaver.internal.mbuki-mvuki.org> | 2007-10-14 11:32:43 -0400 |
commit | 4314b13356e86a153fabf0d290c2d8f760b27f08 (patch) | |
tree | 25b4db3ae62a2c024afe0cbd9544c4b764cc298b /templates/syslinux/common | |
parent | d1978af30a441c5e2d437cbfd7db870d070bd2e2 (diff) | |
download | vyos-live-build-4314b13356e86a153fabf0d290c2d8f760b27f08.tar.gz vyos-live-build-4314b13356e86a153fabf0d290c2d8f760b27f08.zip |
Unify syslinux code, so that pxelinux isolinux & usb-hdd
share more code.
Change pxelinux directory setup to match debian installer
Change syslinux templates to use {$VAR} syntax so the
templates are easier to read
Remove etch support for syslinux, since INCLUDE syntax
is not available in etch syslinux v3.31
Diffstat (limited to 'templates/syslinux/common')
-rw-r--r-- | templates/syslinux/common/help.cfg | 20 | ||||
-rw-r--r-- | templates/syslinux/common/menu.cfg | 6 | ||||
-rw-r--r-- | templates/syslinux/common/splash.rle | bin | 10489 -> 0 bytes | |||
-rw-r--r-- | templates/syslinux/common/syslinux.cfg | 6 |
4 files changed, 16 insertions, 16 deletions
diff --git a/templates/syslinux/common/help.cfg b/templates/syslinux/common/help.cfg index d06fc1879..414f3885e 100644 --- a/templates/syslinux/common/help.cfg +++ b/templates/syslinux/common/help.cfg @@ -1,10 +1,10 @@ -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 +f1 {$LIVE_SCREEN_PATH}/f1.txt +f2 {$LIVE_SCREEN_PATH}/f2.txt +f3 {$LIVE_SCREEN_PATH}/f3.txt +f4 {$LIVE_SCREEN_PATH}/f4.txt +f5 {$LIVE_SCREEN_PATH}/f5.txt +f6 {$LIVE_SCREEN_PATH}/f6.txt +f7 {$LIVE_SCREEN_PATH}/f7.txt +f8 {$LIVE_SCREEN_PATH}/f8.txt +f9 {$LIVE_SCREEN_PATH}/f9.txt +f0 {$LIVE_SCREEN_PATH}/f10.txt diff --git a/templates/syslinux/common/menu.cfg b/templates/syslinux/common/menu.cfg index 093ca0f10..b5a6e5c74 100644 --- a/templates/syslinux/common/menu.cfg +++ b/templates/syslinux/common/menu.cfg @@ -1,8 +1,8 @@ -LINUX_LIVE +{$LINUX_LIVE} -LINUX_INSTALL +{$LINUX_INSTALL} -MEMTEST +{$MEMTEST} #label floppy # localboot 0x00 diff --git a/templates/syslinux/common/splash.rle b/templates/syslinux/common/splash.rle Binary files differdeleted file mode 100644 index df3e15de2..000000000 --- a/templates/syslinux/common/splash.rle +++ /dev/null diff --git a/templates/syslinux/common/syslinux.cfg b/templates/syslinux/common/syslinux.cfg index 83c7a8aba..3e2682eb3 100644 --- a/templates/syslinux/common/syslinux.cfg +++ b/templates/syslinux/common/syslinux.cfg @@ -1,3 +1,3 @@ -include header.cfg -include menu.cfg -include footer.cfg +include {$LIVE_SCREEN_PATH}/header.cfg +include {$LIVE_SCREEN_PATH}/menu.cfg +include {$LIVE_SCREEN_PATH}/footer.cfg |