History

mklive: make this work with grub-2.02.

Juan RP committed 10 years ago

Commit 6653bb61 parent 0bab2421 file · +3 −3Browse files

Unified · Split

mklive.sh.in+3−3
@@ -200,7 +200,7 @@ generate_grub_efi_boot() { · 199 unmodified lines
200 modprobe -q loop || :200 modprobe -q loop || :
201 201
202 # Create EFI vfat image.202 # Create EFI vfat image.
203 dd if=/dev/zero of=$GRUB_DIR/efiboot.img bs=1024 count=4096 >/dev/null 2>&1203 dd if=/dev/zero of=$GRUB_DIR/efiboot.img bs=1024 count=16384 >/dev/null 2>&1
204 mkfs.vfat -F12 -S 512 -n "grub_uefi" "$GRUB_DIR/efiboot.img" >/dev/null 2>&1204 mkfs.vfat -F12 -S 512 -n "grub_uefi" "$GRUB_DIR/efiboot.img" >/dev/null 2>&1
205 205
206 GRUB_EFI_TMPDIR="$(mktemp --tmpdir=$HOME -d)"206 GRUB_EFI_TMPDIR="$(mktemp --tmpdir=$HOME -d)"
@@ -212,7 +212,7 @@ generate_grub_efi_boot() { · 5 unmodified lines
212 xbps-uchroot $VOIDHOSTDIR grub-mkstandalone -- \212 xbps-uchroot $VOIDHOSTDIR grub-mkstandalone -- \
213 --directory="/usr/lib/grub/i386-efi" \213 --directory="/usr/lib/grub/i386-efi" \
214 --format="i386-efi" \214 --format="i386-efi" \
215 --compression="xz" --output="/tmp/bootia32.efi" \215 --output="/tmp/bootia32.efi" \
216 "boot/grub/grub.cfg"216 "boot/grub/grub.cfg"
217 if [ $? -ne 0 ]; then217 if [ $? -ne 0 ]; then
218 umount "$GRUB_EFI_TMPDIR"218 umount "$GRUB_EFI_TMPDIR"
@@ -225,7 +225,7 @@ generate_grub_efi_boot() { · 6 unmodified lines
225 xbps-uchroot $VOIDHOSTDIR grub-mkstandalone -- \225 xbps-uchroot $VOIDHOSTDIR grub-mkstandalone -- \
226 --directory="/usr/lib/grub/x86_64-efi" \226 --directory="/usr/lib/grub/x86_64-efi" \
227 --format="x86_64-efi" \227 --format="x86_64-efi" \
228 --compression="xz" --output="/tmp/bootx64.efi" \228 --output="/tmp/bootx64.efi" \
229 "boot/grub/grub.cfg"229 "boot/grub/grub.cfg"
230 if [ $? -ne 0 ]; then230 if [ $? -ne 0 ]; then
231 umount "$GRUB_EFI_TMPDIR"231 umount "$GRUB_EFI_TMPDIR"

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t