From fa76afa75a259b69b66cf875e408c4834b90aa09 Mon Sep 17 00:00:00 2001 From: Daniele Rondina Date: Sat, 25 Jan 2020 18:58:31 +0100 Subject: [PATCH] video-editing: Fix again ISO title --- molecules/sabayon-amd64-video-editing-dev.spec | 2 +- molecules/sabayon-amd64-video-editing.spec | 6 ++++++ scripts/generic_pre_iso_script.sh | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/molecules/sabayon-amd64-video-editing-dev.spec b/molecules/sabayon-amd64-video-editing-dev.spec index 26dd16f..6e5c832 100644 --- a/molecules/sabayon-amd64-video-editing-dev.spec +++ b/molecules/sabayon-amd64-video-editing-dev.spec @@ -6,7 +6,7 @@ # Pre-ISO building script. Hook to be able to copy kernel images in place, # for example. # NOTE: Not inserted on gnome.common to fix use of forensics pre_iso_script. -%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh "Video Editing" +%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh VideoEditing # Release Version %env release_version: ${SABAYON_RELEASE:-LATEST} diff --git a/molecules/sabayon-amd64-video-editing.spec b/molecules/sabayon-amd64-video-editing.spec index e4db1fe..d73690d 100644 --- a/molecules/sabayon-amd64-video-editing.spec +++ b/molecules/sabayon-amd64-video-editing.spec @@ -3,6 +3,12 @@ %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/video-editing.common %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/amd64.common +# Pre-ISO building script. Hook to be able to copy kernel images in place, +# for example. +# NOTE: Not inserted on gnome.common to fix use of forensics pre_iso_script. +%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh VideoEditing + + # Release Version %env release_version: ${SABAYON_RELEASE:-LATEST} diff --git a/scripts/generic_pre_iso_script.sh b/scripts/generic_pre_iso_script.sh index 43533fe..2007206 100755 --- a/scripts/generic_pre_iso_script.sh +++ b/scripts/generic_pre_iso_script.sh @@ -20,7 +20,7 @@ if [ -n "${boot_kernel}" ] && [ -f "${boot_kernel}" ]; then cp "${boot_ramfs}" "${CDROOT_DIR}/boot/sabayon.igz" || exit 1 fi -if [ "${remaster_type}" = "KDE" ] || [ "${remaster_type}" = "GNOME" ] || [ "${remaster_type}" = "Video Editing" ] ; then +if [ "${remaster_type}" = "KDE" ] || [ "${remaster_type}" = "GNOME" ] || [ "${remaster_type}" = "VideoEditing" ] ; then isolinux_source="${SABAYON_MOLECULE_HOME}/remaster/standard_isolinux.cfg" grub_source="${SABAYON_MOLECULE_HOME}/remaster/standard_grub.cfg" fi