manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syslinux: use linux/initrd placeholders 

enabling improved flexibility for any possible future
path changes.

Gbp-Dch: Ignore
This commit is contained in:
Lyndon Brown 2020-03-26 03:16:20 +00:00 committed by Raphaël Hertzog
parent c3a6e65438
commit 49794f118f
9 changed files with 116 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/build/binary_syslinux
View File

@ -243,6 +243,18 @@ do
fi fi
done 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" MEMTEST_PATH="${_INITRAMFS}/memtest"
sed -i -e "s#@MEMTEST_VERSION@#${LB_MEMTEST}#g" -e "s#@MEMTEST@#/${MEMTEST_PATH}#g" "${_TARGET}"/memtest.cfg sed -i -e "s#@MEMTEST_VERSION@#${LB_MEMTEST}#g" -e "s#@MEMTEST@#/${MEMTEST_PATH}#g" "${_TARGET}"/memtest.cfg

36
share/bootloaders/extlinux/install_gui.cfg
View File

@ -7,14 +7,14 @@ menu begin install
label installgui label installgui
menu label ^Graphical install menu label ^Graphical install
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append vga=788 @APPEND_INSTALL@ --- quiet append vga=788 @APPEND_INSTALL@ --- quiet
label install label install
menu label ^Install menu label ^Install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append vga=788 @APPEND_INSTALL@ --- quiet append vga=788 @APPEND_INSTALL@ --- quiet
menu begin advinstall menu begin advinstall
@ -26,44 +26,44 @@ menu begin install
label expertgui label expertgui
menu label Graphical ^expert install menu label Graphical ^expert install
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append priority=low vga=788 @APPEND_INSTALL@ append priority=low vga=788 @APPEND_INSTALL@
label rescuegui label rescuegui
menu label Graphical ^rescue mode menu label Graphical ^rescue mode
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
label autogui label autogui
menu label Graphical ^automated install menu label Graphical ^automated install
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
label expert label expert
menu label Expert install menu label Expert install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append priority=low vga=788 @APPEND_INSTALL@ append priority=low vga=788 @APPEND_INSTALL@
label rescue label rescue
menu label Rescue mode menu label Rescue mode
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
label auto label auto
menu label Automated install menu label Automated install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
menu end menu end
label installspeechsynth label installspeechsynth
menu label Graphical install with ^speech synthesis menu label Graphical install with ^speech synthesis
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
menu end menu end

16
share/bootloaders/extlinux/install_text.cfg
View File

@ -7,8 +7,8 @@ menu begin install
label install label install
menu label ^Install menu label ^Install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append vga=788 @APPEND_INSTALL@ --- quiet append vga=788 @APPEND_INSTALL@ --- quiet
menu begin advinstall menu begin advinstall
@ -20,20 +20,20 @@ menu begin install
label expert label expert
menu label Expert install menu label Expert install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append priority=low vga=788 @APPEND_INSTALL@ append priority=low vga=788 @APPEND_INSTALL@
label rescue label rescue
menu label Rescue mode menu label Rescue mode
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
label auto label auto
menu label Automated install menu label Automated install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
menu end menu end
menu end menu end

36
share/bootloaders/isolinux/install_gui.cfg
View File

@ -7,14 +7,14 @@ menu begin install
label installgui label installgui
menu label ^Graphical install menu label ^Graphical install
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append vga=788 @APPEND_INSTALL@ --- quiet append vga=788 @APPEND_INSTALL@ --- quiet
label install label install
menu label ^Install menu label ^Install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append vga=788 @APPEND_INSTALL@ --- quiet append vga=788 @APPEND_INSTALL@ --- quiet
menu begin advinstall menu begin advinstall
@ -26,44 +26,44 @@ menu begin install
label expertgui label expertgui
menu label Graphical ^expert install menu label Graphical ^expert install
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append priority=low vga=788 @APPEND_INSTALL@ append priority=low vga=788 @APPEND_INSTALL@
label rescuegui label rescuegui
menu label Graphical ^rescue mode menu label Graphical ^rescue mode
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
label autogui label autogui
menu label Graphical ^automated install menu label Graphical ^automated install
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
label expert label expert
menu label Expert install menu label Expert install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append priority=low vga=788 @APPEND_INSTALL@ append priority=low vga=788 @APPEND_INSTALL@
label rescue label rescue
menu label Rescue mode menu label Rescue mode
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
label auto label auto
menu label Automated install menu label Automated install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
menu end menu end
label installspeechsynth label installspeechsynth
menu label Graphical install with ^speech synthesis menu label Graphical install with ^speech synthesis
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
menu end menu end

16
share/bootloaders/isolinux/install_text.cfg
View File

@ -7,8 +7,8 @@ menu begin install
label install label install
menu label ^Install menu label ^Install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append vga=788 @APPEND_INSTALL@ --- quiet append vga=788 @APPEND_INSTALL@ --- quiet
menu begin advinstall menu begin advinstall
@ -20,20 +20,20 @@ menu begin install
label expert label expert
menu label Expert install menu label Expert install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append priority=low vga=788 @APPEND_INSTALL@ append priority=low vga=788 @APPEND_INSTALL@
label rescue label rescue
menu label Rescue mode menu label Rescue mode
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
label auto label auto
menu label Automated install menu label Automated install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
menu end menu end
menu end menu end

36
share/bootloaders/pxelinux/install_gui.cfg
View File

@ -7,14 +7,14 @@ menu begin install
label installgui label installgui
menu label ^Graphical install menu label ^Graphical install
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append vga=788 @APPEND_INSTALL@ --- quiet append vga=788 @APPEND_INSTALL@ --- quiet
label install label install
menu label ^Install menu label ^Install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append vga=788 @APPEND_INSTALL@ --- quiet append vga=788 @APPEND_INSTALL@ --- quiet
menu begin advinstall menu begin advinstall
@ -26,44 +26,44 @@ menu begin install
label expertgui label expertgui
menu label Graphical ^expert install menu label Graphical ^expert install
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append priority=low vga=788 @APPEND_INSTALL@ append priority=low vga=788 @APPEND_INSTALL@
label rescuegui label rescuegui
menu label Graphical ^rescue mode menu label Graphical ^rescue mode
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
label autogui label autogui
menu label Graphical ^automated install menu label Graphical ^automated install
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
label expert label expert
menu label Expert install menu label Expert install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append priority=low vga=788 @APPEND_INSTALL@ append priority=low vga=788 @APPEND_INSTALL@
label rescue label rescue
menu label Rescue mode menu label Rescue mode
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
label auto label auto
menu label Automated install menu label Automated install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
menu end menu end
label installspeechsynth label installspeechsynth
menu label Graphical install with ^speech synthesis menu label Graphical install with ^speech synthesis
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
menu end menu end

16
share/bootloaders/pxelinux/install_text.cfg
View File

@ -7,8 +7,8 @@ menu begin install
label install label install
menu label ^Install menu label ^Install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append vga=788 @APPEND_INSTALL@ --- quiet append vga=788 @APPEND_INSTALL@ --- quiet
menu begin advinstall menu begin advinstall
@ -20,20 +20,20 @@ menu begin install
label expert label expert
menu label Expert install menu label Expert install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append priority=low vga=788 @APPEND_INSTALL@ append priority=low vga=788 @APPEND_INSTALL@
label rescue label rescue
menu label Rescue mode menu label Rescue mode
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
label auto label auto
menu label Automated install menu label Automated install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
menu end menu end
menu end menu end

36
share/bootloaders/syslinux/install_gui.cfg
View File

@ -7,14 +7,14 @@ menu begin install
label installgui label installgui
menu label ^Graphical install menu label ^Graphical install
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append vga=788 @APPEND_INSTALL@ --- quiet append vga=788 @APPEND_INSTALL@ --- quiet
label install label install
menu label ^Install menu label ^Install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append vga=788 @APPEND_INSTALL@ --- quiet append vga=788 @APPEND_INSTALL@ --- quiet
menu begin advinstall menu begin advinstall
@ -26,44 +26,44 @@ menu begin install
label expertgui label expertgui
menu label Graphical ^expert install menu label Graphical ^expert install
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append priority=low vga=788 @APPEND_INSTALL@ append priority=low vga=788 @APPEND_INSTALL@
label rescuegui label rescuegui
menu label Graphical ^rescue mode menu label Graphical ^rescue mode
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
label autogui label autogui
menu label Graphical ^automated install menu label Graphical ^automated install
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
label expert label expert
menu label Expert install menu label Expert install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append priority=low vga=788 @APPEND_INSTALL@ append priority=low vga=788 @APPEND_INSTALL@
label rescue label rescue
menu label Rescue mode menu label Rescue mode
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
label auto label auto
menu label Automated install menu label Automated install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
menu end menu end
label installspeechsynth label installspeechsynth
menu label Graphical install with ^speech synthesis menu label Graphical install with ^speech synthesis
linux /install/gtk/vmlinuz linux @KERNEL_GI@
initrd /install/gtk/initrd.gz initrd @INITRD_GI@
append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
menu end menu end

16
share/bootloaders/syslinux/install_text.cfg
View File

@ -7,8 +7,8 @@ menu begin install
label install label install
menu label ^Install menu label ^Install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append vga=788 @APPEND_INSTALL@ --- quiet append vga=788 @APPEND_INSTALL@ --- quiet
menu begin advinstall menu begin advinstall
@ -20,20 +20,20 @@ menu begin install
label expert label expert
menu label ^Expert install menu label ^Expert install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append priority=low vga=788 @APPEND_INSTALL@ append priority=low vga=788 @APPEND_INSTALL@
label rescue label rescue
menu label ^Rescue mode menu label ^Rescue mode
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
label auto label auto
menu label ^Automated install menu label ^Automated install
linux /install/vmlinuz linux @KERNEL_DI@
initrd /install/initrd.gz initrd @INITRD_DI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
menu end menu end
menu end menu end