commit: 90e1cbf32bf1de2854e8ed21dbd644b10b4e22ad
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 26 23:34:19 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jul 29 00:32:08 2021 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=90e1cbf3
targets: Remove some ISOLINUX leftovers
We don't use ISOLINUX since the commit listed below.
Fixes: 0a27a7a3 ("targets: Use GRUB for BIOS boot")
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
doc/HOWTO.txt | 7 +------
targets/support/create-iso.sh | 2 +-
targets/support/functions.sh | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/doc/HOWTO.txt b/doc/HOWTO.txt
index 7b759121..865e348d 100644
--- a/doc/HOWTO.txt
+++ b/doc/HOWTO.txt
@@ -216,16 +216,11 @@ the kernel, bootloader, filesystem, and other details.
See
Live USBs
---------
-The easiest way to create a live USB is currently to install a live CD
-ISO using
-http://www.syslinux.org/wiki/index.php/Doc/isolinux#HYBRID_CD-ROM.2FHARD_DISK_MODE[isohybrid]
-and `dd`:
+The easiest way to create a live USB is to install a live CD ISO using
- # isohybrid filename.iso
# dd if=filename.iso of=/dev/sdX
replacing `X` with the appropriate drive letter for your USB disk.
-See https://bugs.gentoo.org/251719[bug 251719] for details.
Running catalyst from a Git checkout
------------------------------------
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 70684f78..9b2cbb60 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -102,7 +102,7 @@ isoroot_checksum() {
echo ">> Creating checksums for all files included in the ISO"
pushd "${clst_target_path}"
- find -type f ! -name 'isolinux.bin' -exec b2sum {} + >
/tmp/isoroot_b2sums
+ find -type f -exec b2sum {} + > /tmp/isoroot_b2sums
popd
mv /tmp/isoroot_b2sums "${clst_target_path}"/
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index d1252369..4340a3c7 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -49,7 +49,7 @@ extract_kernels() {
# ${clst_target_path}/kernel is often a good choice for ${1}
# Takes the relative desination dir for the kernel as an arguement
- # i.e boot or isolinux
+ # i.e boot
[ -z "$clst_boot_kernel" ] && \
die "Required key boot/kernel not defined, exiting"
# install the kernels built in kmerge.sh
