From 0d15098ef3ab204ba813bdd2ca1f353e4d0126b6 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Fri, 29 Apr 2005 13:32:51 +0000 Subject: [PATCH] Fix isolinux so that it finds menus and kernels and stuff git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@636 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- modules/livecd_stage2_target.py | 11 +++++++++-- targets/support/bootloader-setup.sh | 12 ++++++------ targets/support/create-iso.sh | 12 ++++++++++-- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92bf76e1..00c7169c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.248 2005/04/28 16:45:43 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.249 2005/04/29 13:32:51 rocket Exp $ + + 29 Apr 2005; Eric Edgar + modules/livecd_stage2_target.py, targets/support/bootloader-setup.sh, + targets/support/create-iso.sh: + Fix isolinux so that it finds menus and kernels and stuff 28 Apr 2005; Eric Edgar modules/generic_stage_target.py: diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py index c0d59074..7d2e0c64 100644 --- a/modules/livecd_stage2_target.py +++ b/modules/livecd_stage2_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.39 2005/04/28 13:46:48 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.40 2005/04/29 13:32:51 rocket Exp $ """ Builder class for a LiveCD stage2 build. @@ -86,13 +86,20 @@ class livecd_stage2_target(generic_stage_target): myf.close() def set_action_sequence(self): + #self.settings["action_sequence"]=["dir_setup","unpack","unpack_snapshot",\ + # "config_profile_link","setup_confdir","portage_overlay",\ + # "bind","chroot_setup","setup_environment","run_local",\ + # "build_kernel","bootloader","preclean","livecd_update", + # "root_overlay","fsscript","rcupdate","unmerge",\ + # "unbind","remove","empty","target_setup",\ + # "setup_overlay","create_iso","clear_autoresume"] self.settings["action_sequence"]=["dir_setup","unpack","unpack_snapshot",\ "config_profile_link","setup_confdir","portage_overlay",\ "bind","chroot_setup","setup_environment","run_local",\ "build_kernel","bootloader","preclean","livecd_update", "root_overlay","fsscript","rcupdate","unmerge",\ "unbind","remove","empty","target_setup",\ - "setup_overlay","create_iso","clear_autoresume"] + "setup_overlay","create_iso"] def register(foo): foo.update({"livecd-stage2":livecd_stage2_target}) diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index 606e4a2b..68ad427f 100755 --- a/targets/support/bootloader-setup.sh +++ b/targets/support/bootloader-setup.sh @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.2 2005/04/27 17:44:58 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.3 2005/04/29 13:32:51 rocket Exp $ . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh @@ -113,7 +113,7 @@ case ${clst_mainarch} in echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}" echo >> ${icfg} echo "label ${x}" >> ${icfg} - echo " kernel ${x}" >> ${icfg} + echo " kernel ${x}" >> ${icfg} if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ] then echo " append ${default_append_line} vga=791 dokeymap splash=silent,theme:${clst_livecd_splash_theme}" >> ${icfg} @@ -124,8 +124,8 @@ case ${clst_mainarch} in echo >> ${icfg} echo " ${x}" >> ${kmsg} echo "label ${x}-nofb" >> ${icfg} - echo " kernel ${x}" >> ${icfg} - echo " append ${default_append_line} " >> ${icfg} + echo " kernel ${x}" >> ${icfg} + echo " append ${default_append_line} " >> ${icfg} echo >> ${icfg} echo " ${x}-nofb" >> ${kmsg} done @@ -134,8 +134,8 @@ case ${clst_mainarch} in then echo >> $icfg echo " memtest86" >> $kmsg - echo " title memtest86" >> $icfg - echo " kernel memtest86" >> $icfg + echo "label memtest86" >> $icfg + echo " kernel memtest86" >> $icfg fi fi diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh index 4f19c18a..dafca96a 100755 --- a/targets/support/create-iso.sh +++ b/targets/support/create-iso.sh @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.2 2005/04/27 17:44:58 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.3 2005/04/29 13:32:51 rocket Exp $ . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh #. ${clst_sharedir}/targets/${clst_target}/${clst_mainarch}-archscript.sh @@ -72,18 +72,26 @@ case ${clst_mainarch} in # if [ -e ${clst_target_path}/boot/isolinux.bin ] then + echo "Creating ISO using ISOLINUX bootloader" + if [ -d ${clst_target_path}/isolinux ] + then + rm -r ${clst_target_path}/isolinux + fi + mv ${clst_target_path}/boot ${clst_target_path}/isolinux + case ${clst_fstype} in zisofs) mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -b boot/isolinux.bin -c boot/boot.cat -no-emul-boot \ -boot-load-size 4 -boot-info-table -z ${clst_target_path} || die "Cannot make ISO image" ;; *) - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -b boot/isolinux.bin -c boot/boot.cat -no-emul-boot \ + mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot \ -boot-load-size 4 -boot-info-table ${clst_target_path} || die "Cannot make ISO image" ;; esac elif [ -e ${clst_target_path}/boot/grub/stage2_eltorito ] then + echo "Creating ISO using GRUB bootloader" case ${clst_fstype} in zisofs) mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -b boot/grub/stage2_eltorito -c boot/boot.cat -no-emul-boot \ -- 2.26.2