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
scripts/generic_pre_iso_script.sh
+4 -4
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