diff options
| -rwxr-xr-x | scripts/build/binary_syslinux | 12 | ||||
| -rw-r--r-- | share/bootloaders/extlinux/install_gui.cfg | 36 | ||||
| -rw-r--r-- | share/bootloaders/extlinux/install_text.cfg | 16 | ||||
| -rw-r--r-- | share/bootloaders/isolinux/install_gui.cfg | 36 | ||||
| -rw-r--r-- | share/bootloaders/isolinux/install_text.cfg | 16 | ||||
| -rw-r--r-- | share/bootloaders/pxelinux/install_gui.cfg | 36 | ||||
| -rw-r--r-- | share/bootloaders/pxelinux/install_text.cfg | 16 | ||||
| -rw-r--r-- | share/bootloaders/syslinux/install_gui.cfg | 36 | ||||
| -rw-r--r-- | share/bootloaders/syslinux/install_text.cfg | 16 |
9 files changed, 116 insertions, 104 deletions
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 1fdd5a97c..84a32cd31 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -243,6 +243,18 @@ do fi done +KERNEL_DI="/install/vmlinuz" +INITRD_DI="/install/initrd.gz" +KERNEL_GI="/install/gtk/vmlinuz" +INITRD_GI="/install/gtk/initrd.gz" + +sed -i \ + -e "s|@KERNEL_GI@|${KERNEL_GI}|" \ + -e "s|@INITRD_GI@|${INITRD_GI}|" \ + -e "s|@KERNEL_DI@|${KERNEL_DI}|" \ + -e "s|@INITRD_DI@|${INITRD_DI}|" \ + "${_TARGET}"/install.cfg + MEMTEST_PATH="${_INITRAMFS}/memtest" sed -i -e "s#@MEMTEST_VERSION@#${LB_MEMTEST}#g" -e "s#@MEMTEST@#/${MEMTEST_PATH}#g" "${_TARGET}"/memtest.cfg diff --git a/share/bootloaders/extlinux/install_gui.cfg b/share/bootloaders/extlinux/install_gui.cfg index 1c98beef9..656130ffd 100644 --- a/share/bootloaders/extlinux/install_gui.cfg +++ b/share/bootloaders/extlinux/install_gui.cfg @@ -7,14 +7,14 @@ menu begin install label installgui menu label ^Graphical install - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append vga=788 @APPEND_INSTALL@ --- quiet label install menu label ^Install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append vga=788 @APPEND_INSTALL@ --- quiet menu begin advinstall @@ -26,44 +26,44 @@ menu begin install label expertgui menu label Graphical ^expert install - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append priority=low vga=788 @APPEND_INSTALL@ label rescuegui menu label Graphical ^rescue mode - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet label autogui menu label Graphical ^automated install - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet label expert menu label Expert install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append priority=low vga=788 @APPEND_INSTALL@ label rescue menu label Rescue mode - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet label auto menu label Automated install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet menu end label installspeechsynth menu label Graphical install with ^speech synthesis - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet menu end diff --git a/share/bootloaders/extlinux/install_text.cfg b/share/bootloaders/extlinux/install_text.cfg index 197d647e7..86faf719c 100644 --- a/share/bootloaders/extlinux/install_text.cfg +++ b/share/bootloaders/extlinux/install_text.cfg @@ -7,8 +7,8 @@ menu begin install label install menu label ^Install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append vga=788 @APPEND_INSTALL@ --- quiet menu begin advinstall @@ -20,20 +20,20 @@ menu begin install label expert menu label Expert install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append priority=low vga=788 @APPEND_INSTALL@ label rescue menu label Rescue mode - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet label auto menu label Automated install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet menu end menu end diff --git a/share/bootloaders/isolinux/install_gui.cfg b/share/bootloaders/isolinux/install_gui.cfg index 1c98beef9..656130ffd 100644 --- a/share/bootloaders/isolinux/install_gui.cfg +++ b/share/bootloaders/isolinux/install_gui.cfg @@ -7,14 +7,14 @@ menu begin install label installgui menu label ^Graphical install - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append vga=788 @APPEND_INSTALL@ --- quiet label install menu label ^Install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append vga=788 @APPEND_INSTALL@ --- quiet menu begin advinstall @@ -26,44 +26,44 @@ menu begin install label expertgui menu label Graphical ^expert install - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append priority=low vga=788 @APPEND_INSTALL@ label rescuegui menu label Graphical ^rescue mode - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet label autogui menu label Graphical ^automated install - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet label expert menu label Expert install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append priority=low vga=788 @APPEND_INSTALL@ label rescue menu label Rescue mode - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet label auto menu label Automated install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet menu end label installspeechsynth menu label Graphical install with ^speech synthesis - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet menu end diff --git a/share/bootloaders/isolinux/install_text.cfg b/share/bootloaders/isolinux/install_text.cfg index 197d647e7..86faf719c 100644 --- a/share/bootloaders/isolinux/install_text.cfg +++ b/share/bootloaders/isolinux/install_text.cfg @@ -7,8 +7,8 @@ menu begin install label install menu label ^Install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append vga=788 @APPEND_INSTALL@ --- quiet menu begin advinstall @@ -20,20 +20,20 @@ menu begin install label expert menu label Expert install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append priority=low vga=788 @APPEND_INSTALL@ label rescue menu label Rescue mode - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet label auto menu label Automated install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet menu end menu end diff --git a/share/bootloaders/pxelinux/install_gui.cfg b/share/bootloaders/pxelinux/install_gui.cfg index 1c98beef9..656130ffd 100644 --- a/share/bootloaders/pxelinux/install_gui.cfg +++ b/share/bootloaders/pxelinux/install_gui.cfg @@ -7,14 +7,14 @@ menu begin install label installgui menu label ^Graphical install - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append vga=788 @APPEND_INSTALL@ --- quiet label install menu label ^Install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append vga=788 @APPEND_INSTALL@ --- quiet menu begin advinstall @@ -26,44 +26,44 @@ menu begin install label expertgui menu label Graphical ^expert install - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append priority=low vga=788 @APPEND_INSTALL@ label rescuegui menu label Graphical ^rescue mode - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet label autogui menu label Graphical ^automated install - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet label expert menu label Expert install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append priority=low vga=788 @APPEND_INSTALL@ label rescue menu label Rescue mode - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet label auto menu label Automated install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet menu end label installspeechsynth menu label Graphical install with ^speech synthesis - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet menu end diff --git a/share/bootloaders/pxelinux/install_text.cfg b/share/bootloaders/pxelinux/install_text.cfg index 197d647e7..86faf719c 100644 --- a/share/bootloaders/pxelinux/install_text.cfg +++ b/share/bootloaders/pxelinux/install_text.cfg @@ -7,8 +7,8 @@ menu begin install label install menu label ^Install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append vga=788 @APPEND_INSTALL@ --- quiet menu begin advinstall @@ -20,20 +20,20 @@ menu begin install label expert menu label Expert install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append priority=low vga=788 @APPEND_INSTALL@ label rescue menu label Rescue mode - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet label auto menu label Automated install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet menu end menu end diff --git a/share/bootloaders/syslinux/install_gui.cfg b/share/bootloaders/syslinux/install_gui.cfg index 1c98beef9..656130ffd 100644 --- a/share/bootloaders/syslinux/install_gui.cfg +++ b/share/bootloaders/syslinux/install_gui.cfg @@ -7,14 +7,14 @@ menu begin install label installgui menu label ^Graphical install - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append vga=788 @APPEND_INSTALL@ --- quiet label install menu label ^Install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append vga=788 @APPEND_INSTALL@ --- quiet menu begin advinstall @@ -26,44 +26,44 @@ menu begin install label expertgui menu label Graphical ^expert install - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append priority=low vga=788 @APPEND_INSTALL@ label rescuegui menu label Graphical ^rescue mode - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet label autogui menu label Graphical ^automated install - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet label expert menu label Expert install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append priority=low vga=788 @APPEND_INSTALL@ label rescue menu label Rescue mode - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet label auto menu label Automated install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet menu end label installspeechsynth menu label Graphical install with ^speech synthesis - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz + linux @KERNEL_GI@ + initrd @INITRD_GI@ append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet menu end diff --git a/share/bootloaders/syslinux/install_text.cfg b/share/bootloaders/syslinux/install_text.cfg index a7c33e316..628a59e3d 100644 --- a/share/bootloaders/syslinux/install_text.cfg +++ b/share/bootloaders/syslinux/install_text.cfg @@ -7,8 +7,8 @@ menu begin install label install menu label ^Install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append vga=788 @APPEND_INSTALL@ --- quiet menu begin advinstall @@ -20,20 +20,20 @@ menu begin install label expert menu label ^Expert install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append priority=low vga=788 @APPEND_INSTALL@ label rescue menu label ^Rescue mode - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet label auto menu label ^Automated install - linux /install/vmlinuz - initrd /install/initrd.gz + linux @KERNEL_DI@ + initrd @INITRD_DI@ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet menu end menu end |