diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-08-02 18:06:02 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-12-16 18:45:20 -0600 |
| commit | 3ad57c6aa37653e367c9ee13e2b12ae77e4a667a (patch) | |
| tree | 053221e35d07481aad8c2c12f112a6ae3a3fffb8 | |
| parent | dd7dfb9cbc9ba6d967236906d47b087db64bf6b5 (diff) | |
| download | image-3ad57c6aa37653e367c9ee13e2b12ae77e4a667a.tar.gz image-3ad57c6aa37653e367c9ee13e2b12ae77e4a667a.tar.bz2 image-3ad57c6aa37653e367c9ee13e2b12ae77e4a667a.tar.xz image-3ad57c6aa37653e367c9ee13e2b12ae77e4a667a.zip | |
x86 -> GRUB
| -rw-r--r-- | iso-params-pmmx | 2 | ||||
| -rw-r--r-- | iso-params-x86_64 | 2 | ||||
| -rw-r--r-- | packages-pmmx | 4 | ||||
| -rw-r--r-- | packages-x86_64 | 1 | ||||
| -rwxr-xr-x | post-pmmx.sh | 24 | ||||
| -rwxr-xr-x | post-x86_64.sh | 24 |
6 files changed, 27 insertions, 30 deletions
diff --git a/iso-params-pmmx b/iso-params-pmmx index f91158b..a897a55 100644 --- a/iso-params-pmmx +++ b/iso-params-pmmx @@ -1 +1 @@ --b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table +--grub2-boot-info --grub2-mbr /usr/lib/grub/i386-pc/boot_hybrid.img -eltorito-boot boot/grubcore.img -no-emul-boot -boot-load-size 4 -boot-info-table --eltorito-catalog boot/grub.cat -eltorito-alt-boot -e boot/grubcore-efi.img -no-emul-boot -isohybrid-gpt-basdat diff --git a/iso-params-x86_64 b/iso-params-x86_64 index f91158b..a897a55 100644 --- a/iso-params-x86_64 +++ b/iso-params-x86_64 @@ -1 +1 @@ --b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table +--grub2-boot-info --grub2-mbr /usr/lib/grub/i386-pc/boot_hybrid.img -eltorito-boot boot/grubcore.img -no-emul-boot -boot-load-size 4 -boot-info-table --eltorito-catalog boot/grub.cat -eltorito-alt-boot -e boot/grubcore-efi.img -no-emul-boot -isohybrid-gpt-basdat diff --git a/packages-pmmx b/packages-pmmx index 689c3d7..0602861 100644 --- a/packages-pmmx +++ b/packages-pmmx @@ -1,4 +1,6 @@ dmidecode dosfstools +efibootmgr +grub-efi +mactel-boot strace -syslinux diff --git a/packages-x86_64 b/packages-x86_64 index 2ea6305..0602861 100644 --- a/packages-x86_64 +++ b/packages-x86_64 @@ -4,4 +4,3 @@ efibootmgr grub-efi mactel-boot strace -syslinux diff --git a/post-pmmx.sh b/post-pmmx.sh index ff04986..6daa760 100755 --- a/post-pmmx.sh +++ b/post-pmmx.sh @@ -1,16 +1,14 @@ -printf '\033[01;32m * \033[37mInstalling ISOLINUX...\033[00;39m\n' +mkdir -p cdroot-pmmx/boot -mkdir cdroot-$ARCH/isolinux +if ! type grub-mkimage>/dev/null; then + printf "GRUB image cannot be created. Using stale copy.\n" + printf "If you don't have one, this will fail!\n" +else + printf '\033[01;32m * \033[37mInstalling GRUB...\033[00;39m\n' + grub-mkimage -c x86/early.cfg -v -p boot -o grubcore-stage1.img -O i386-pc biosdisk boot btrfs datetime disk ext2 gfxmenu help iso9660 jfs linux ls luks lvm memdisk nilfs2 normal part_gpt part_msdos png scsi search xfs reboot gfxterm gfxterm_background gfxterm_menu + cat /usr/lib/grub/i386-pc/cdboot.img grubcore-stage1.img > cdroot-pmmx/boot/grubcore.img -cat >cdroot-$ARCH/isolinux/isolinux.cfg <<BOOTCFG -prompt 1 -default adelie - -label adelie - kernel /bzImage - append initrd=/initrd -BOOTCFG - -cp /usr/share/syslinux/isolinux.bin cdroot-$ARCH/isolinux/isolinux.bin -cp /usr/share/syslinux/ldlinux.c32 cdroot-$ARCH/isolinux/ + grub-mkimage -c x86/early.cfg -v -p boot -o cdroot-pmmx/boot/grubcore-efi.img -O i386-efi boot btrfs datetime disk ext2 gfxmenu help iso9660 jfs ls luks lvm memdisk nilfs2 normal part_gpt part_msdos png scsi search xfs linux reboot gfxterm gfxterm_background gfxterm_menu +fi +cp x86/grub.cfg cdroot-pmmx/boot/grub.cfg diff --git a/post-x86_64.sh b/post-x86_64.sh index ff04986..1939162 100755 --- a/post-x86_64.sh +++ b/post-x86_64.sh @@ -1,16 +1,14 @@ -printf '\033[01;32m * \033[37mInstalling ISOLINUX...\033[00;39m\n' +mkdir -p cdroot-x86_64/boot -mkdir cdroot-$ARCH/isolinux +if ! type grub-mkimage>/dev/null; then + printf "GRUB image cannot be created. Using stale copy.\n" + printf "If you don't have one, this will fail!\n" +else + printf '\033[01;32m * \033[37mInstalling GRUB...\033[00;39m\n' + grub-mkimage -c x86/early.cfg64 -v -p boot -o grubcore-stage1.img -O i386-pc biosdisk boot btrfs datetime disk ext2 gfxmenu help iso9660 jfs linux ls luks lvm memdisk nilfs2 normal part_gpt part_msdos png scsi search xfs reboot gfxterm gfxterm_background gfxterm_menu + cat /usr/lib/grub/i386-pc/cdboot.img grubcore-stage1.img > cdroot-x86_64/boot/grubcore.img -cat >cdroot-$ARCH/isolinux/isolinux.cfg <<BOOTCFG -prompt 1 -default adelie - -label adelie - kernel /bzImage - append initrd=/initrd -BOOTCFG - -cp /usr/share/syslinux/isolinux.bin cdroot-$ARCH/isolinux/isolinux.bin -cp /usr/share/syslinux/ldlinux.c32 cdroot-$ARCH/isolinux/ + grub-mkimage -c x86/early.cfg64 -v -p boot -o cdroot-x86_64/boot/grubcore-efi.img -O x86_64-efi boot btrfs datetime disk ext2 gfxmenu help iso9660 jfs ls luks lvm memdisk nilfs2 normal part_gpt part_msdos png scsi search xfs linux reboot gfxterm gfxterm_background gfxterm_menu +fi +cp x86/grub.cfg64 cdroot-x86_64/boot/grub.cfg |