diff options
author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-08 20:27:41 +0100 |
---|---|---|
committer | Raphaƫl Hertzog <hertzog@debian.org> | 2020-04-23 15:59:39 +0000 |
commit | bf63762721ddfa497e1b6e4b311178fd68a0b012 (patch) | |
tree | c743fa82a182c433bf593563ac41dfe7669cee17 /scripts/build/binary_iso | |
parent | 49794f118f55570bbccbef649bbf941bbc091ee3 (diff) | |
download | vyos-live-build-bf63762721ddfa497e1b6e4b311178fd68a0b012.tar.gz vyos-live-build-bf63762721ddfa497e1b6e4b311178fd68a0b012.zip |
move grub-pc specific code to actual grub-pc script
the grub-pc image creation code has no business being in binary_iso, it
should be in binary_grub-pc.
it should be noted that the binary_iso script did not even have the
necessary package check for grub-mkimage, while binary_grub-pc did have
it, pointlessly.
Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_iso')
-rwxr-xr-x | scripts/build/binary_iso | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index f2a166cf7..9952b0c51 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -160,30 +160,8 @@ done # XORRISO_OPTIONS="${XORRISO_OPTIONS} -m ${XORRISO_EXCLUDE}" #fi -if [ "${LB_FIRST_BOOTLOADER}" = "grub-pc" ] -then - cat > binary.sh << EOF #!/bin/sh - -input_dir=/usr/lib/grub/i386-pc - -# build core.img -core_img=\$(mktemp) -grub-mkimage -d \${input_dir} -o \${core_img} -O i386-pc --prefix=/boot/grub biosdisk iso9660 - -# build grub_eltorito image -cat \${input_dir}/cdboot.img \${core_img} > binary/boot/grub/grub_eltorito - -rm -f \${core_img} -EOF - -else - echo "#!/bin/sh" > binary.sh -fi - -cat >> binary.sh << EOF - mkdir -p binary/.disk xorriso -as mkisofs ${XORRISO_OPTIONS} -o ${IMAGE} binary EOF |