Merge branch 'master' of ssh://git.code.sf.net/p/refind/code

[refind] / mountesp

diff --git a/mountesp b/mountesp
index e1c35a78d45133cd6887962a019f6e48db3f4536..03dc5c0a179be913baad88c9a8a576abc5871c97 100755 (executable)
--- a/mountesp
+++ b/mountesp
@@ -1,4 +1,18 @@
 #!/bin/bash
+#
+# Mac OS X script to locate and mount an EFI System Partition (ESP)
+#
+# Usage:
+#
+# ./mountesp
+#
+# This program is copyright (c) 2012-2015 by Roderick W. Smith
+# It is released under the terms of the GNU GPL, version 3,
+# a copy of which should be included in the file COPYING.txt.
+#
+# Revision history:
+#
+# 0.9.3   -- Initial release (with rEFInd 0.9.3)
 
 # Mount the ESP at /Volumes/ESP or determine its current mount
 # point.
@@ -25,17 +39,22 @@ MountOSXESP() {
         fi
     fi
     Esp=/dev/`echo $Temp`
+    echo "The ESP has been identified as $Esp; attempting to mount it...."
     # If the ESP is mounted, use its current mount point....
     Temp=`df -P | grep "$Esp "`
     MountPoint=`echo $Temp | cut -f 6- -d ' '`
     if [[ "$MountPoint" == '' ]] ; then
+        if [[ $UID != 0 ]] ; then
+            echo "You must run this program as root or using sudo! Exiting!"
+            exit 1
+        fi
         MountPoint="/Volumes/ESP"
         mkdir /Volumes/ESP &> /dev/null
-        mount -t msdos "$Esp" /Volumes/ESP
+        mount -t msdos "$Esp" $MountPoint
         # Some systems have HFS+ "ESPs." They shouldn't, but they do. If this is
         # detected, mount it as such and set appropriate options.
         if [[ $? != 0 ]] ; then
-            mount -t hfs "$Esp" /Volumes/Esp
+            mount -t hfs "$Esp" $MountPoint
             if [[ $? != 0 ]] ; then
                 echo "Unable to mount ESP!\n"
                 exit 1