fix pxe boot, I had to change the paths so that syslinux
could find all the files.
thanks,
Jesse
commit bd31cdff3354e443c58a5031e238c3d480416324
Author: Jesse Hathaway <[EMAIL PROTECTED]>
Date: Mon Oct 1 16:34:20 2007 -0400
fix syslinux pxe boot
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 6b28fdd..92963ea 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -552,8 +552,8 @@ case "${LH_BINARY_IMAGES}" in
fi
# Configure syslinux templates
- sed -i -e "[EMAIL PROTECTED]@${LINUX_LIVE}@" -e "[EMAIL PROTECTED]@${LINUX_INSTALL}@" -e "[EMAIL PROTECTED]@${MEMTEST}@" tftpboot/pxelinux.cfg/default
- sed -i -e "s#LH_BOOTAPPEND_INSTALL#${LH_BOOTAPPEND_INSTALL}#" -e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" -e "s/LH_NET_SERVER/${LH_NET_SERVER}/" -e "s#LH_NET_PATH#${LH_NET_PATH}#" tftpboot/pxelinux.cfg/default
+ sed -i -e "[EMAIL PROTECTED]@${LINUX_LIVE}@" -e "[EMAIL PROTECTED]@${LINUX_INSTALL}@" -e "[EMAIL PROTECTED]@${MEMTEST}@" tftpboot/pxelinux.cfg/menu.cfg
+ sed -i -e "s#LH_BOOTAPPEND_INSTALL#${LH_BOOTAPPEND_INSTALL}#" -e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" -e "s/LH_NET_SERVER/${LH_NET_SERVER}/" -e "s#LH_NET_PATH#${LH_NET_PATH}#" tftpboot/pxelinux.cfg/menu.cfg
sed -i -e "s/LH_DISTRIBUTION/${LH_DISTRIBUTION}/" -e "s/LH_DATE/$(date +%Y%m%d)/" -e "s/LH_MEDIA/netboot/" tftpboot/pxelinux.cfg/f1.txt
sed -i -e "s/LH_MEDIA/netboot/" tftpboot/pxelinux.cfg/f3.txt
sed -i -e "s/LH_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
@@ -563,7 +563,7 @@ case "${LH_BINARY_IMAGES}" in
then
mv "${DESTDIR_LIVE}"/vmlinuz-*-${LH_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
mv "${DESTDIR_LIVE}"/initrd.img-*-${LH_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
- sed -i -e "s/vmlinuz-.*-${LH_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LH_LINUX_FLAVOURS}/initrd.img/g" tftpboot/pxelinux.cfg/default
+ sed -i -e "s/vmlinuz-.*-${LH_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LH_LINUX_FLAVOURS}/initrd.img/g" tftpboot/pxelinux.cfg/menu.cfg
fi
sed -i -e "s/LINUX_TIMEOUT/${LH_SYSLINUX_TIMEOUT}/" tftpboot/pxelinux.cfg/default
diff --git a/templates/syslinux/ca/boot.txt b/templates/syslinux/ca/boot.txt
index 55fad73..0513deb 100644
--- a/templates/syslinux/ca/boot.txt
+++ b/templates/syslinux/ca/boot.txt
@@ -1,3 +1,3 @@
-splash.rle
+pxelinux.cfg/splash.rle
Premeu F1 i control, i llavors el 1 per obtenir ajuda, o INTRO per fer el
diff --git a/templates/syslinux/common/prompt.cfg b/templates/syslinux/common/prompt.cfg
index 32dd85c..1b482ae 100644
--- a/templates/syslinux/common/prompt.cfg
+++ b/templates/syslinux/common/prompt.cfg
@@ -1,15 +1,10 @@
-prompt 1
-display boot.txt
-timeout 0
-include menu.cfg
-
-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 pxelinux.cfg/f1.txt
+f2 pxelinux.cfg/f2.txt
+f3 pxelinux.cfg/f3.txt
+f4 pxelinux.cfg/f4.txt
+f5 pxelinux.cfg/f5.txt
+f6 pxelinux.cfg/f6.txt
+f7 pxelinux.cfg/f7.txt
+f8 pxelinux.cfg/f8.txt
+f9 pxelinux.cfg/f9.txt
+f0 pxelinux.cfg/f10.txt
diff --git a/templates/syslinux/common/syslinux.cfg b/templates/syslinux/common/syslinux.cfg
index b930e36..135523b 100644
--- a/templates/syslinux/common/syslinux.cfg
+++ b/templates/syslinux/common/syslinux.cfg
@@ -1,6 +1,7 @@
-include header.cfg
-include menu.cfg
-include footer.cfg
-DISPLAY boot.txt
+include pxelinux.cfg/header.cfg
+include pxelinux.cfg/menu.cfg
+include pxelinux.cfg/footer.cfg
+include pxelinux.cfg/prompt.cfg
+DISPLAY pxelinux.cfg/boot.txt
PROMPT 1
diff --git a/templates/syslinux/en/boot.txt b/templates/syslinux/en/boot.txt
index 56dffca..c3f92a8 100644
--- a/templates/syslinux/en/boot.txt
+++ b/templates/syslinux/en/boot.txt
@@ -1,3 +1,3 @@
-splash.rle
+pxelinux.cfg/splash.rle
Press F1control and F then 1 for help, or ENTER to
diff --git a/templates/syslinux/es/boot.txt b/templates/syslinux/es/boot.txt
index 064172a..460a41a 100644
--- a/templates/syslinux/es/boot.txt
+++ b/templates/syslinux/es/boot.txt
@@ -1,3 +1,3 @@
-splash.rle
+pxelinux.cfg/splash.rle
Pulse F1control y F, y entonces 1 para obtener ayuda, o INTRO para
_______________________________________________
debian-live-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-live-devel
