diff options
author | Andrew Cady <d@cryptonomic.net> | 2021-01-18 20:22:12 -0500 |
---|---|---|
committer | Andrew Cady <d@cryptonomic.net> | 2021-01-18 20:22:12 -0500 |
commit | 459d655a19fd1e59137ec6ca2a158f91a5a2a3cd (patch) | |
tree | 11a7df0793bd39ff705f5d24730e8e4e593242f7 /src | |
parent | 72dcf5220a7503a62edb024db32b84dfcd54c103 (diff) |
working
Diffstat (limited to 'src')
-rwxr-xr-x | src/partvi | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -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 | ||
286 | target=x86_64-efi | ||
287 | target=i386-pc | ||
288 | set -- grub-install --force --target=$target --removable | ||
289 | |||
290 | for f in part*.conf | 286 | for f in part*.conf |
291 | do | 287 | do |
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 |
320 | done | 316 | done |
321 | 317 | ||
322 | loudly $sudo "$@" "$whole" | 318 | loudly $sudo grub-install --force --target=i386-pc --recheck --boot-directory="$BOOT_DIR" "$whole" |
319 | loudly $sudo grub-install --force --target=x86_64-efi --removable --efi-directory="$EFI_DIR" "$whole" | ||
323 | 320 | ||
324 | for f in part*.conf | 321 | for f in part*.conf |
325 | do | 322 | do |