summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2018-03-10 04:01:04 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2018-03-10 04:01:04 +0000
commit5ab69adb03b7b8cc7f7bb0c4d853f23b58350626 (patch)
treefee3e022487ccd468fc3596bf1cbb46d5652d527
parent80d35be19270209f8878d1b533f8d3463c840f98 (diff)
parentefc3a75f537af0ba340e6452ea9e9c82be88e3de (diff)
downloadimage-5ab69adb03b7b8cc7f7bb0c4d853f23b58350626.tar.gz
image-5ab69adb03b7b8cc7f7bb0c4d853f23b58350626.tar.bz2
image-5ab69adb03b7b8cc7f7bb0c4d853f23b58350626.tar.xz
image-5ab69adb03b7b8cc7f7bb0c4d853f23b58350626.zip
Merge branch 'isohybrid' into 'master'
Enable use of the isohybrid tool The `isohybrid` tool (included with `syslinux`) allows users to create a bootable USB image from the CD images we distribute. However, in order for this to work the CD images must include `isolinux.bin`, not `isolinux-debug.bin`. Otherwise you will get an error like this: ``` $ isohybrid adelie-full-x86_64-1.0-alpha4-20171223.iso isohybrid: adelie-full-x86_64-1.0-alpha4-20171223.iso: boot loader does not have an isolinux.bin hybrid signature. Note that isolinux-debug.bin does not support hybrid booting ``` This change is made for `pmmx` and `x86_64`. I then used this change and built a new CD image, then ran `isohybrid adelie-full-x86_64-...`. The resulting image (it has the same filename by default) can be pushed to a USB drive like so (taken from [`syslinux`'s documentation](http://www.syslinux.org/wiki/index.php?title=Isohybrid)): ``` # dd bs=2048 if=/path/to/adelie.iso of=/dev/sdX status=progress ``` [Arch](https://wiki.archlinux.org/index.php/USB_flash_installation_media#Using_dd) uses `bs=4M oflag=sync`. Someone smarter than me can determine if this is needed. No further changes were necessary to boot from USB at that point, other than fiddling with boot order and such. Something else to consider is whether Adélie should distribute these hybrid images pre-made, or if it should be left to the user. See merge request !1
-rwxr-xr-xpost-pmmx.sh2
-rwxr-xr-xpost-x86_64.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/post-pmmx.sh b/post-pmmx.sh
index 5f9d433..ff04986 100755
--- a/post-pmmx.sh
+++ b/post-pmmx.sh
@@ -11,6 +11,6 @@ label adelie
append initrd=/initrd
BOOTCFG
-cp /usr/share/syslinux/isolinux-debug.bin cdroot-$ARCH/isolinux/isolinux.bin
+cp /usr/share/syslinux/isolinux.bin cdroot-$ARCH/isolinux/isolinux.bin
cp /usr/share/syslinux/ldlinux.c32 cdroot-$ARCH/isolinux/
diff --git a/post-x86_64.sh b/post-x86_64.sh
index 5f9d433..ff04986 100755
--- a/post-x86_64.sh
+++ b/post-x86_64.sh
@@ -11,6 +11,6 @@ label adelie
append initrd=/initrd
BOOTCFG
-cp /usr/share/syslinux/isolinux-debug.bin cdroot-$ARCH/isolinux/isolinux.bin
+cp /usr/share/syslinux/isolinux.bin cdroot-$ARCH/isolinux/isolinux.bin
cp /usr/share/syslinux/ldlinux.c32 cdroot-$ARCH/isolinux/