openmamba/makedist-openmamba
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

platforms/{livecd,livedvd}: fix live boot with dracut 059 which requires rd.live.overlay.overlayfs set on command line

Browse Source
This commit is contained in:
Silvan Calarco 2023-12-25 13:46:18 +01:00
parent 5c541dd360
commit 786e681a04
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
platforms/livecd/post.inc.sh
View File

@ -65,12 +65,13 @@ _EOF
# #
# Boot entries # Boot entries
# #
ROOT_ARGS="root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} rd.live.overlay.overlayfs"
ISOID= ISOID=
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
menuentry "openmamba GNU/Linux (${KERNEL_MAJVER}${K})" { menuentry "openmamba GNU/Linux (${KERNEL_MAJVER}${K})" {
echo "Loading /boot/vmlinuz${ISOID}" echo "Loading /boot/vmlinuz${ISOID}"
linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} selinux=0 quiet splash ro linux /boot/vmlinuz${ISOID} ${ROOT_ARGS} selinux=0 quiet splash ro
echo "Loading /boot/initrd${ISOID}.gz" echo "Loading /boot/initrd${ISOID}.gz"
initrd /boot/initrd${ISOID}.gz initrd /boot/initrd${ISOID}.gz
} }
@ -87,7 +88,7 @@ _EOF
# cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF # cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
# menuentry "No modeset (${KERNEL_MAJVER}${K})" { # menuentry "No modeset (${KERNEL_MAJVER}${K})" {
# echo "Loading /boot/vmlinuz${ISOID}" # echo "Loading /boot/vmlinuz${ISOID}"
# linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} selinux=0 quiet splash ro nomodeset # linux /boot/vmlinuz${ISOID} ${ROOT_ARGS} selinux=0 quiet splash ro nomodeset
# echo "Loading /boot/initrd${ISOID}.gz" # echo "Loading /boot/initrd${ISOID}.gz"
# initrd /boot/initrd${ISOID}.gz # initrd /boot/initrd${ISOID}.gz
# } # }
@ -100,7 +101,7 @@ for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
menuentry "Debug mode (${KERNEL_MAJVER}${K})" { menuentry "Debug mode (${KERNEL_MAJVER}${K})" {
echo "Loading /boot/vmlinuz${ISOID}" echo "Loading /boot/vmlinuz${ISOID}"
linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 rddebug linux /boot/vmlinuz${ISOID} ${ROOT_ARGS} ro selinux=0 rddebug
echo "Loading /boot/initrd${ISOID}.gz" echo "Loading /boot/initrd${ISOID}.gz"
initrd /boot/initrd${ISOID}.gz initrd /boot/initrd${ISOID}.gz
} }
@ -112,7 +113,7 @@ for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
menuentry "Debug mode with nomodeset (${KERNEL_MAJVER}${K})" { menuentry "Debug mode with nomodeset (${KERNEL_MAJVER}${K})" {
echo "Loading /boot/vmlinuz${ISOID}" echo "Loading /boot/vmlinuz${ISOID}"
linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 rddebug nomodeset linux /boot/vmlinuz${ISOID} ${ROOT_ARGS} ro selinux=0 rddebug nomodeset
echo "Loading /boot/initrd${ISOID}.gz" echo "Loading /boot/initrd${ISOID}.gz"
initrd /boot/initrd${ISOID}.gz initrd /boot/initrd${ISOID}.gz
} }

10
platforms/livedvd/post.inc.sh
View File

@ -65,6 +65,7 @@ _EOF
# #
# Boot entries # Boot entries
# #
ROOT_ARGS="root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} rd.live.overlay.overlayfs"
for l in $MULTILANGUAGE; do for l in $MULTILANGUAGE; do
case $l in case $l in
"en") LABEL="English"; LOCALELANG="en_US.UTF-8"; VCONSOLEKEYMAP="us" ;; "en") LABEL="English"; LOCALELANG="en_US.UTF-8"; VCONSOLEKEYMAP="us" ;;
@ -83,7 +84,7 @@ _EOF
cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
menuentry "openmamba GNU/Linux (${KERNEL_MAJVER}${K} - ${l})" { menuentry "openmamba GNU/Linux (${KERNEL_MAJVER}${K} - ${l})" {
echo "Loading /boot/vmlinuz${ISOID}" echo "Loading /boot/vmlinuz${ISOID}"
linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} selinux=0 quiet splash ro locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP linux /boot/vmlinuz${ISOID} ${ROOT_ARGS} selinux=0 quiet splash ro locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP
echo "Loading /boot/initrd${ISOID}.gz" echo "Loading /boot/initrd${ISOID}.gz"
initrd /boot/initrd${ISOID}.gz initrd /boot/initrd${ISOID}.gz
} }
@ -100,20 +101,19 @@ _EOF
# cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF # cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
# menuentry "No modeset (${KERNEL_MAJVER}${K})" { # menuentry "No modeset (${KERNEL_MAJVER}${K})" {
# echo "Loading /boot/vmlinuz${ISOID}" # echo "Loading /boot/vmlinuz${ISOID}"
# linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} selinux=0 quiet splash ro nomodeset # linux /boot/vmlinuz${ISOID} ${ROOT_ARGS} selinux=0 quiet splash ro nomodeset
# echo "Loading /boot/initrd${ISOID}.gz" # echo "Loading /boot/initrd${ISOID}.gz"
# initrd /boot/initrd${ISOID}.gz # initrd /boot/initrd${ISOID}.gz
# } # }
#_EOF #_EOF
# ISOID=$(($ISOID + 1)) # ISOID=$(($ISOID + 1))
#done #done
ISOID= ISOID=
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
menuentry "Debug mode (${KERNEL_MAJVER}${K} - ${l})" { menuentry "Debug mode (${KERNEL_MAJVER}${K} - ${l})" {
echo "Loading /boot/vmlinuz${ISOID}" echo "Loading /boot/vmlinuz${ISOID}"
linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 rddebug locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP linux /boot/vmlinuz${ISOID} ${ROOT_ARGS} ro selinux=0 rddebug locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP
echo "Loading /boot/initrd${ISOID}.gz" echo "Loading /boot/initrd${ISOID}.gz"
initrd /boot/initrd${ISOID}.gz initrd /boot/initrd${ISOID}.gz
} }
@ -125,7 +125,7 @@ _EOF
cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
menuentry "Debug mode with nomodeset (${KERNEL_MAJVER}${K} - ${l})" { menuentry "Debug mode with nomodeset (${KERNEL_MAJVER}${K} - ${l})" {
echo "Loading /boot/vmlinuz${ISOID}" echo "Loading /boot/vmlinuz${ISOID}"
linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 rddebug nomodeset locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP linux /boot/vmlinuz${ISOID} ${ROOT_ARGS} ro selinux=0 rddebug nomodeset locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP
echo "Loading /boot/initrd${ISOID}.gz" echo "Loading /boot/initrd${ISOID}.gz"
initrd /boot/initrd${ISOID}.gz initrd /boot/initrd${ISOID}.gz
} }