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

Revert "[molecules*] move kernels on live images to /kernel (from /boot)"

Browse Source 
This reverts commit 54be8ed618.
This commit is contained in:
Fabio Erculiani
2012-12-04 21:55:23 +01:00
parent 54be8ed618
commit 43dd030c74
10 changed files with 93 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/amd64_x86_pre_iso_script.sh
View File

@@ -72,8 +72,8 @@ if [ -z "${tmp_dir}" ]; then
exit 1
fi
# also rename kernel and initramfs inside the CDROOT dir
mv "${CDROOT_DIR}/kernel/sabayon" "${CDROOT_DIR}/kernel/sabayon${current_arch}" || exit 1
mv "${CDROOT_DIR}/kernel/sabayon.igz" "${CDROOT_DIR}/kernel/sabayon${current_arch}.igz" || exit 1
mv "${CDROOT_DIR}/boot/sabayon" "${CDROOT_DIR}/boot/sabayon${current_arch}" || exit 1
mv "${CDROOT_DIR}/boot/sabayon.igz" "${CDROOT_DIR}/boot/sabayon${current_arch}.igz" || exit 1
mount -o loop "${other_iso_path}" "${tmp_dir}" || exit 1
other_squashfs_path="${tmp_dir}/livecd.squashfs"
@@ -83,8 +83,8 @@ if [ ! -f "${other_squashfs_path}" ]; then
fi
cp "${other_squashfs_path}" "${CDROOT_DIR}/livecd${other_arch}.squashfs" || exit 1
# copy kernel and initramfs
cp "${tmp_dir}/kernel/sabayon" "${CDROOT_DIR}/kernel/sabayon${other_arch}" || exit 1
cp "${tmp_dir}/kernel/sabayon.igz" "${CDROOT_DIR}/kernel/sabayon${other_arch}.igz" || exit 1
cp "${tmp_dir}/boot/sabayon" "${CDROOT_DIR}/boot/sabayon${other_arch}" || exit 1
cp "${tmp_dir}/boot/sabayon.igz" "${CDROOT_DIR}/boot/sabayon${other_arch}.igz" || exit 1
# copy back.jpg to proper location
isolinux_img="${SABAYON_MOLECULE_HOME}/remaster/embedded_world/back.jpg"

8
scripts/generic_pre_iso_script.sh
View File

@@ -23,16 +23,16 @@ elif [ "${remaster_type}" = "ServerBase" ]; then
echo "ServerBase trigger, copying server kernel over"
boot_kernel=$(find "${CHROOT_DIR}/boot" -name "kernel-*" | sort | head -n 1)
boot_ramfs=$(find "${CHROOT_DIR}/boot" -name "initramfs-*" | sort | head -n 1)
cp "${boot_kernel}" "${CDROOT_DIR}/kernel/sabayon" || exit 1
cp "${boot_ramfs}" "${CDROOT_DIR}/kernel/sabayon.igz" || exit 1
cp "${boot_kernel}" "${CDROOT_DIR}/boot/sabayon" || exit 1
cp "${boot_ramfs}" "${CDROOT_DIR}/boot/sabayon.igz" || exit 1
isolinux_source="${SABAYON_MOLECULE_HOME}/remaster/serverbase_isolinux.cfg"
grub_source="${SABAYON_MOLECULE_HOME}/remaster/serverbase_grub.cfg"
elif [ "${remaster_type}" = "HardenedServer" ]; then
echo "HardenedServer trigger, copying server kernel over"
boot_kernel=$(find "${CHROOT_DIR}/boot" -name "kernel-*" | sort | head -n 1)
boot_ramfs=$(find "${CHROOT_DIR}/boot" -name "initramfs-*" | sort | head -n 1)
cp "${boot_kernel}" "${CDROOT_DIR}/kernel/sabayon" || exit 1
cp "${boot_ramfs}" "${CDROOT_DIR}/kernel/sabayon.igz" || exit 1
cp "${boot_kernel}" "${CDROOT_DIR}/boot/sabayon" || exit 1
cp "${boot_ramfs}" "${CDROOT_DIR}/boot/sabayon.igz" || exit 1
isolinux_source="${SABAYON_MOLECULE_HOME}/remaster/hardenedserver_isolinux.cfg"
grub_source="${SABAYON_MOLECULE_HOME}/remaster/hardenedserver_grub.cfg"
fi

4
scripts/spinbase_pre_iso_script.sh
View File

@@ -8,7 +8,7 @@ SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
export SABAYON_MOLECULE_HOME
boot_dir="${CHROOT_DIR}/boot"
cdroot_boot_dir="${CDROOT_DIR}/kernel"
cdroot_boot_dir="${CDROOT_DIR}/boot"
kernels=( "${boot_dir}"/kernel-* )
# get the first one and see if it exists
@@ -26,8 +26,6 @@ if [ ! -f "${initramfs}" ]; then
exit 1
fi
mkdir -p "${cdroot_boot_dir}" || exit 1
# copy kernel and initramfs
cp "${kernel}" "${cdroot_boot_dir}"/sabayon || exit 1
cp "${initramfs}" "${cdroot_boot_dir}"/sabayon.igz || exit 1