summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Frazer <sfrazer@duoconsulting.com>2011-01-17 15:36:49 -0600
committerBryan McLellan <btm@opscode.com>2011-06-01 17:46:14 -0700
commit638e61c2e85d1b272d18ab695d40dcbaa3dd7fe1 (patch)
treee285047336c4006409bcbf995b64885e18ae9b3f
parent608eaf772b13f7cf52d2154e4ea7813edb451e7a (diff)
downloadchef-638e61c2e85d1b272d18ab695d40dcbaa3dd7fe1.tar.gz
solves issue with root mount point not being found in fstab
-rw-r--r--chef/lib/chef/provider/mount/mount.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/chef/lib/chef/provider/mount/mount.rb b/chef/lib/chef/provider/mount/mount.rb
index e1e4077dac..7419182d6e 100644
--- a/chef/lib/chef/provider/mount/mount.rb
+++ b/chef/lib/chef/provider/mount/mount.rb
@@ -64,7 +64,8 @@ class Chef
@current_resource.dump($3.to_i)
@current_resource.pass($4.to_i)
Chef::Log.debug("Found mount #{device_fstab} to #{@new_resource.mount_point} in /etc/fstab")
- when /^[\/\w]+\s+#{Regexp.escape(@new_resource.mount_point)}/
+ next
+ when /^[\/\w]+\s+#{Regexp.escape(@new_resource.mount_point)}\s+/
enabled = false
Chef::Log.debug("Found conflicting mount point #{@new_resource.mount_point} in /etc/fstab")
end