summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@cryptonomic.net>2021-01-18 20:22:12 -0500
committerAndrew Cady <d@cryptonomic.net>2021-01-18 20:22:12 -0500
commit459d655a19fd1e59137ec6ca2a158f91a5a2a3cd (patch)
tree11a7df0793bd39ff705f5d24730e8e4e593242f7
parent72dcf5220a7503a62edb024db32b84dfcd54c103 (diff)
working
-rwxr-xr-xsrc/partvi11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/partvi b/src/partvi
index 59b1419..654c235 100755
--- a/src/partvi
+++ b/src/partvi
@@ -283,10 +283,6 @@ whole=$(losetup -j whole.img -O NAME --noheadings)
283 283
284$sudo kpartx -u "$whole" 284$sudo kpartx -u "$whole"
285 285
286target=x86_64-efi
287target=i386-pc
288set -- grub-install --force --target=$target --removable
289
290for f in part*.conf 286for f in part*.conf
291do 287do
292 [ "$f" != part0.conf ] || continue 288 [ "$f" != part0.conf ] || continue
@@ -307,9 +303,9 @@ do
307 if [ "$type" = 'bios-grub' ] 303 if [ "$type" = 'bios-grub' ]
308 then 304 then
309 $sudo mkdir "$mnt"/grub 305 $sudo mkdir "$mnt"/grub
310 set -- "$@" --boot-directory="$mnt" 306 BOOT_DIR=$mnt
311 else 307 else
312 set -- "$@" --efi-directory="$mnt" 308 EFI_DIR=$mnt
313 fi 309 fi
314 ;; 310 ;;
315 *) mkdir -p "$mnt" 311 *) mkdir -p "$mnt"
@@ -319,7 +315,8 @@ do
319 esac 315 esac
320done 316done
321 317
322loudly $sudo "$@" "$whole" 318loudly $sudo grub-install --force --target=i386-pc --recheck --boot-directory="$BOOT_DIR" "$whole"
319loudly $sudo grub-install --force --target=x86_64-efi --removable --efi-directory="$EFI_DIR" "$whole"
323 320
324for f in part*.conf 321for f in part*.conf
325do 322do