diff options
| author | Juan RP <xtraeme@gmail.com> | 2014-06-29 17:57:32 +0200 |
|---|---|---|
| committer | Juan RP <xtraeme@gmail.com> | 2014-06-29 17:57:32 +0200 |
| commit | ca3a146bbb0a8433d2a004f77d63facab11ed8aa (patch) | |
| tree | d6bb83738e52b6b12b5db87de8391ed8a50a658e /mklive.sh.in | |
| parent | ef81fb90f810a771686a8cc0f52cb2b70985357e (diff) | |
| download | hrmpf-ca3a146bbb0a8433d2a004f77d63facab11ed8aa.tar.gz hrmpf-ca3a146bbb0a8433d2a004f77d63facab11ed8aa.tar.xz hrmpf-ca3a146bbb0a8433d2a004f77d63facab11ed8aa.zip | |
mklive.sh: run grub-mkstandalone via xbps-uchroot(8) to avoid host issues.
Diffstat (limited to 'mklive.sh.in')
| -rw-r--r-- | mklive.sh.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mklive.sh.in b/mklive.sh.in index c31768c..7b55791 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -186,14 +186,16 @@ generate_grub_efi_boot() { LOOP_DEVICE="$(losetup --show --find ${GRUB_DIR}/efiboot.img)" mount -o rw,flush -t vfat "${LOOP_DEVICE}" "${GRUB_EFI_TMPDIR}" >>$LOGFILE 2>&1 - cd $IMAGEDIR - mkdir -p "${GRUB_EFI_TMPDIR}/EFI/boot/" - grub-mkstandalone --directory="$VOIDHOSTDIR/usr/lib/grub/x86_64-efi" \ + cp -a $IMAGEDIR/boot $VOIDHOSTDIR + xbps-uchroot $VOIDHOSTDIR grub-mkstandalone --directory="/usr/lib/grub/x86_64-efi" \ --format="x86_64-efi" \ - --compression="xz" --output="${GRUB_EFI_TMPDIR}/EFI/boot/bootx64.efi" \ + --compression="xz" --output="/tmp/bootx64.efi" \ "boot/grub/grub.cfg" >>$LOGFILE 2>&1 umount "$GRUB_EFI_TMPDIR" losetup --detach "${LOOP_DEVICE}" + cd $IMAGEDIR + mkdir -p ${GRUB_EFI_TMPDIR}/EFI/boot + cp -f $VOIDHOSTDIR/tmp/bootx64.efi ${GRUB_EFI_TMPDIR}/EFI/boot/ rm -rf $GRUB_EFI_TMPDIR } |