summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-04-01 20:16:22 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-04-01 20:16:22 +0000
commit0eae739fd34ff297b7468cfa8b729c213568c30f (patch)
treed3e12171a560431b1435eb6ccef04b887d7879e7 /lib
parent48d7fd66a28157c81cce756e93d97139c3cc061b (diff)
downloadpuppet-0eae739fd34ff297b7468cfa8b729c213568c30f.tar.gz
puppet-0eae739fd34ff297b7468cfa8b729c213568c30f.tar.xz
puppet-0eae739fd34ff297b7468cfa8b729c213568c30f.zip
renaming filesystem to mount
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1049 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
-rwxr-xr-xlib/puppet/type/parsedtype/mount.rb (renamed from lib/puppet/type/parsedtype/filesystem.rb)32
1 files changed, 16 insertions, 16 deletions
diff --git a/lib/puppet/type/parsedtype/filesystem.rb b/lib/puppet/type/parsedtype/mount.rb
index 65b1832d3..08f797f72 100755
--- a/lib/puppet/type/parsedtype/filesystem.rb
+++ b/lib/puppet/type/parsedtype/mount.rb
@@ -4,7 +4,7 @@ require 'puppet/type/parsedtype'
require 'puppet/type/state'
module Puppet
- newtype(:filesystem, Puppet::Type::ParsedType) do
+ newtype(:mount, Puppet::Type::ParsedType) do
ensurable do
newvalue(:present) do
@@ -18,7 +18,7 @@ module Puppet
@parent.unmount
end
- :filesystem_removed
+ :mount_removed
end
newvalue(:mounted) do
@@ -28,13 +28,13 @@ module Puppet
@parent.mount
- :filesystem_mounted
+ :mount_mounted
end
end
newstate(:device) do
- desc "The device providing the filesystem. This can be whatever
- device is supporting by the filesystem, including network
+ desc "The device providing the mount. This can be whatever
+ device is supporting by the mount, including network
devices or devices specified by UUID rather than device
path, depending on the operating system."
end
@@ -61,37 +61,37 @@ module Puppet
end
newstate(:fstype) do
- desc "The filesystem type. Valid values depend on the
+ desc "The mount type. Valid values depend on the
operating system."
end
newstate(:options) do
- desc "Mount options for the filesystems, as they would
+ desc "Mount options for the mounts, as they would
appear in the fstab."
end
newstate(:pass) do
- desc "The pass in which the filesystem is checked."
+ desc "The pass in which the mount is checked."
end
newstate(:atboot) do
- desc "Whether to mount the filesystem at boot. Not all platforms
+ desc "Whether to mount the mount at boot. Not all platforms
support this."
end
newstate(:dump) do
- desc "Whether to dump the filesystem. Not all platforms
+ desc "Whether to dump the mount. Not all platforms
support this."
end
newparam(:path) do
- desc "The mount path for the filesystem."
+ desc "The mount path for the mount."
isnamevar
end
- @doc = "Manages mounted filesystems, including putting mount
- information into the filesystem table."
+ @doc = "Manages mounted mounts, including putting mount
+ information into the mount table."
@instances = []
@@ -107,10 +107,10 @@ module Puppet
@filetype = Puppet::FileType.filetype(:flat)
- # Parse a filesystem tab.
+ # Parse a mount tab.
#
# This method also stores existing comments, and it stores all
- # filesystems in order, mostly so that comments are retained in the
+ # mounts in order, mostly so that comments are retained in the
# order they were written and in proximity to the same fses.
def self.parse(text)
count = 0
@@ -156,7 +156,7 @@ module Puppet
end
end
- # Is the filesystem currently mounted?
+ # Is the mount currently mounted?
def mounted?
%x{df}.split("\n").find do |line|
fs = line.split(/\s+/)[-1]