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