@@ -39,7 +39,7 @@ def load_current_resource
           Chef::Log.debug("Checking for mount point #{@current_resource.mount_point}")
 
           # only check for existence of non-remote devices
-          if(@new_resource.device !~ /:/ && @new_resource.device !~ /\/\// && !::File.exists?(@new_resource.device) )
+          if(@new_resource.device !~ /:/ && @new_resource.device !~ /\/\// && !::File.exists?(device_real) )
             raise Chef::Exceptions::Mount, "Device #{@new_resource.device} does not exist"
           elsif( !::File.exists?(@new_resource.mount_point) )
             raise Chef::Exceptions::Mount, "Mount point #{@new_resource.mount_point} does not exist"
@@ -84,7 +84,14 @@ def mount_fs
           unless @current_resource.mounted
             command = "mount -t #{@new_resource.fstype}"
             command << " -o #{@new_resource.options.join(',')}" unless @new_resource.options.nil? || @new_resource.options.empty?
-            command << " #{device_real}"
+            command << case @new_resource.device_type
+            when :device
+              " #{device_real}"
+            when :label
+              " -L #{@new_resource.device}"
+            when :uuid
+              " -U #{@new_resource.device}"
+            end
             command << " #{@new_resource.mount_point}"
             shell_out!(command)
             Chef::Log.info("Mounted #{@new_resource.mount_point}")
@@ -174,11 +181,10 @@ def device_real
             if @new_resource.device_type == :device
               @real_device = @new_resource.device
             else
+              @real_device = ""
               status = popen4("/sbin/findfs #{device_fstab}") do |pid, stdin, stdout, stderr|
-                @real_device = stdout.first.chomp
-              end
-              unless status.exitstatus == 0
-                @real_device = "/dev/null"
+                device_line = stdout.first # stdout.first consumes
+                @real_device = device_line.chomp unless device_line.nil?
               end
             end
           end
 
@@ -49,18 +49,35 @@
       @provider.current_resource.mount_point.should == '/tmp/foo'
       @provider.current_resource.device.should == '/dev/sdz1'
     end
+    
+    it "should accecpt device_type :uuid" do
+      @new_resource.device_type :uuid
+      @new_resource.device "d21afe51-a0fe-4dc6-9152-ac733763ae0a"
+      @stdout_findfs = mock("STDOUT", :first => "/dev/sdz1")
+      @provider.should_receive(:popen4).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_yield(@pid,@stdin,@stdout_findfs,@stderr).and_return(@status)
+      @provider.load_current_resource()
+    end
 
     it "should raise an error if the mount device does not exist" do
       ::File.stub!(:exists?).with("/dev/sdz1").and_return false
       lambda { @provider.load_current_resource() }.should raise_error(Chef::Exceptions::Mount)
     end
-
+    
+    it "should raise an error if the mount device (uuid) does not exist" do
+      @new_resource.device_type :uuid
+      @new_resource.device "d21afe51-a0fe-4dc6-9152-ac733763ae0a"
+      status_findfs = mock("Status", :exitstatus => 1)
+      stdout_findfs = mock("STDOUT", :first => nil)
+      @provider.should_receive(:popen4).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_yield(@pid,@stdin,stdout_findfs,@stderr).and_return(status_findfs)
+      ::File.should_receive(:exists?).with("").and_return(false)
+      lambda { @provider.load_current_resource() }.should raise_error(Chef::Exceptions::Mount)
+    end
+    
     it "should raise an error if the mount point does not exist" do
       ::File.stub!(:exists?).with("/tmp/foo").and_return false
       lambda { @provider.load_current_resource() }.should raise_error(Chef::Exceptions::Mount)
     end
 
-
     it "should set mounted true if the mount point is found in the mounts list" do
       @provider.stub!(:shell_out!).and_return(OpenStruct.new(:stdout => '/dev/sdz1 on /tmp/foo'))
       @provider.load_current_resource()
@@ -175,6 +192,16 @@
         @provider.should_receive(:shell_out!).with("mount -t ext3 -o rw,noexec,noauto /dev/sdz1 /tmp/foo")
         @provider.mount_fs()
       end
+      
+      it "should mount the filesystem specified by uuid" do
+        @new_resource.device "d21afe51-a0fe-4dc6-9152-ac733763ae0a"
+        @new_resource.device_type :uuid
+        @stdout_findfs = mock("STDOUT", :first => "/dev/sdz1")
+        @provider.stub!(:popen4).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_yield(@pid,@stdin,@stdout_findfs,@stderr).and_return(@status)
+        @stdout.stub!(:each).and_yield("#{@new_resource.device} on #{@new_resource.mount_point}")
+        @provider.should_receive(:shell_out!).with("mount -t #{@new_resource.fstype} -o defaults -U #{@new_resource.device} #{@new_resource.mount_point}")
+        @provider.mount_fs()
+      end
 
       it "should not mount the filesystem if it is mounted" do
         @current_resource.stub!(:mounted).and_return(true)