[mactel-boot/f17] Fix destination path for disk label install

[Matthew Garrett]

commit 676cb235443f79150faee0a1279dc7ca2f3cf603
Author: Matthew Garrett <mjg at redhat.com>
Date:   Mon May 14 18:17:49 2012 -0400

    Fix destination path for disk label install

 mactel-boot-setup |    6 +++---
 mactel-boot.spec  |    6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/mactel-boot-setup b/mactel-boot-setup
index c8715be..fd084ec 100644
--- a/mactel-boot-setup
+++ b/mactel-boot-setup
@@ -9,14 +9,14 @@ if [ -f /boot/efi/EFI/redhat/grub.efi ]; then
    ln -sf ../../../EFI/redhat/grub.conf /boot/efi/System/Library/CoreServices/boot.conf;
    hfs-bless /boot/efi/EFI/redhat/grub.efi   
    if [ -f /usr/share/pixmaps/bootloader/fedora.vol ]; then
-      cp /usr/share/pixmaps/bootloader/fedora.vol /boot/efi/redhat/.disk_label;
+      cp /usr/share/pixmaps/bootloader/fedora.vol /boot/efi/EFI/redhat/.disk_label;
    fi
-elif [ x`df -T /boot/efi | tail -n +2 | awk '{print $2}'` = x"hfsplus" ]; then
+elif [ -f /boot/efi/EFI/redhat/grub2-efi/grub.efi ]; then
    ln -f /boot/efi/EFI/redhat/grub2-efi/grub.efi /boot/efi/System/Library/CoreServices/boot.efi;
    ln -sf ../../../EFI/redhat/grub2-efi/grub.cfg /boot/efi/System/Library/CoreServices/boot.cfg;
    hfs-bless /boot/efi/EFI/redhat/grub2-efi/grub.efi
    if [ -f /usr/share/pixmaps/bootloader/fedora.vol ]; then
-      cp /usr/share/pixmaps/bootloader/fedora.vol /boot/efi/redhat/.disk_label;
+      cp /usr/share/pixmaps/bootloader/fedora.vol /boot/efi/EFI/redhat/.disk_label;
    fi
 fi
 
diff --git a/mactel-boot.spec b/mactel-boot.spec
index 9642cf5..1a14322 100644
--- a/mactel-boot.spec
+++ b/mactel-boot.spec
@@ -1,6 +1,6 @@
 Name:		mactel-boot
 Version:	0.9
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Intel Mac boot files
 
 Group:		System Environment/Base
@@ -51,7 +51,6 @@ rm -rf $RPM_BUILD_ROOT
 /usr/libexec/mactel-boot-setup
 %attr(0755, root, root) %ghost /boot/efi/System/Library/CoreServices/boot.efi
 %attr(0644, root, root) %ghost /boot/efi/.VolumeIcon.icns
-%attr(0644, root, root) %ghost /boot/efi/.disk_label
 %attr(0644, root, root) %ghost /boot/efi/EFI/redhat/.disk_label
 %attr(0644, root, root) %ghost /boot/efi/EFI/redhat/grub2-efi/.disk_label
 %attr(0644, root, root) %ghost /boot/efi/System/Library/CoreServices/.disk_label
@@ -60,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/libexec/mactel-boot-setup
 
 %changelog
+* Mon May 14 2012 Matthew Garrett <mjg at redhat.com> - 0.9-6
+- Fix destination path for disk label install
+
 * Wed Apr 25 2012 Matthew Garrett <mjg at redhat.com> - 0.9-5
 - Move trigger functionality into an external script