sablink/molecules
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[scripts] move make_grub_efi.sh call farther and assume that it always finds a working grub.cfg

Browse Source
This commit is contained in:
Fabio Erculiani
2012-12-25 16:15:45 +01:00
parent dbef67dc42
commit 4ce7de0e5b
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/amd64_x86_pre_iso_script.sh
View File

@@ -14,9 +14,6 @@ other_iso_path="${4}"
SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
export SABAYON_MOLECULE_HOME
# generate EFI GRUB
"${SABAYON_MOLECULE_HOME}"/scripts/make_grub_efi.sh || exit 1
pre_iso_signal_handler() {
if [ -d "${tmp_dir}" ] && [ -n "${tmp_dir}" ]; then
umount -f "${tmp_dir}"
@@ -42,6 +39,9 @@ cp "${grub_source}" "${grub_destination}" || exit 1
"${SABAYON_MOLECULE_HOME}"/scripts/make_grub_langs.sh "${grub_destination}" \
|| exit 1
# generate EFI GRUB
"${SABAYON_MOLECULE_HOME}"/scripts/make_grub_efi.sh || exit 1
ver=${RELEASE_VERSION}
[[ -z "${ver}" ]] && ver=${CUR_DATE}
[[ -z "${ver}" ]] && ver="6"

6
scripts/generic_pre_iso_script.sh
View File

@@ -7,9 +7,6 @@
SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
export SABAYON_MOLECULE_HOME
# generate EFI GRUB
"${SABAYON_MOLECULE_HOME}"/scripts/make_grub_efi.sh || exit 1
remaster_type="${1}"
isolinux_source="${SABAYON_MOLECULE_HOME}/remaster/minimal_isolinux.cfg"
grub_source="${SABAYON_MOLECULE_HOME}/remaster/minimal_grub.cfg"
@@ -43,6 +40,9 @@ cp "${grub_source}" "${grub_destination}" || exit 1
"${SABAYON_MOLECULE_HOME}"/scripts/make_grub_langs.sh "${grub_destination}" \
|| exit 1
# generate EFI GRUB
"${SABAYON_MOLECULE_HOME}"/scripts/make_grub_efi.sh || exit 1
ver=${RELEASE_VERSION}
[[ -z "${ver}" ]] && ver=${CUR_DATE}
[[ -z "${ver}" ]] && ver="6"

6
scripts/spinbase_pre_iso_script.sh
View File

@@ -30,9 +30,6 @@ fi
cp "${kernel}" "${cdroot_boot_dir}"/sabayon || exit 1
cp "${initramfs}" "${cdroot_boot_dir}"/sabayon.igz || exit 1
# generate EFI GRUB
"${SABAYON_MOLECULE_HOME}"/scripts/make_grub_efi.sh || exit 1
# Write build info
build_date=$(date)
build_file="${CDROOT_DIR}"/BUILD_INFO
@@ -56,6 +53,9 @@ done
"${SABAYON_MOLECULE_HOME}"/scripts/make_grub_langs.sh "${grub_dest}" \
|| exit 1
# generate EFI GRUB
"${SABAYON_MOLECULE_HOME}"/scripts/make_grub_efi.sh || exit 1
sabayon_pkgs_file="${CHROOT_DIR}/etc/sabayon-pkglist"
if [ -f "${sabayon_pkgs_file}" ]; then
cp "${sabayon_pkgs_file}" "${CDROOT_DIR}/pkglist"