diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2018-11-04 11:51:22 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-11-04 11:51:22 +0100 |
| commit | 16ff12d635f7b773215701714891491e379a489e (patch) | |
| tree | e508dd79eb1d51f6fae575c1b1b0d0e4e34ecca9 /scripts | |
| parent | 00349ef90e4ced5bd844d26772e3f69aa28a7575 (diff) | |
| download | imagefish-16ff12d635f7b773215701714891491e379a489e.tar.gz | |
misc minor tweaks
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/tar-to-image.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/tar-to-image.sh b/scripts/tar-to-image.sh index 0ad2532..e7e8a55 100755 --- a/scripts/tar-to-image.sh +++ b/scripts/tar-to-image.sh @@ -19,7 +19,7 @@ function msg() { } function do_cleanup() { - msg "cleaning up ..." + msg "cleaning up" if test "$GUESTFISH_PID" != ""; then guestfish --remote -- exit >/dev/null 2>&1 || true fi @@ -160,6 +160,7 @@ function fish_init() { } function fish_fini() { + msg "finishing" fish umount-all fish exit } @@ -277,7 +278,7 @@ EOF if test "$haveboot" = "true"; then echo "### have ${uefi_boot_file}, good" else - grubefi=$(guestfish --remote -- ls /boot/efi/EFI/*/grub*.efi) + grubefi=$(guestfish --remote -- glob-expand /boot/efi/EFI/*/grub*.efi) echo "### install ${grubefi} as ${uefi_boot_file}" fish cp ${grubefi} /boot/efi/EFI/BOOT/${uefi_boot_file} fi |