puppet 3.8.7 → 4.0.0.rc1

data/man/man8/puppet.8

@@ -1,10 +1,10 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET" "8" "January 2013" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET" "8" "February 2015" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\fR
 .
 .P
-See \'puppet help\' for help on available puppet subcommands
+[1;31mError: Could not parse application options: invalid option: \-\-help[0m

data/spec/fixtures/integration/provider/mailalias/aliases/test1

@@ -26,3 +26,6 @@ decode:     root
 # Other tests
 anothertest: "|/path/to/rt-mailgate --queue 'another test' --action correspond --url http://my.com/"
 test: "|/path/to/rt-mailgate --queue 'test' --action correspond --url http://my.com/"
+
+# Included file
+incfile: :include: /tmp/somefile

data/spec/fixtures/integration/provider/sshkey/sample

@@ -0,0 +1,21 @@
+hosting2.planetargon.com,64.34.164.77 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAy+f2t52cDMrYkgEKQ6juqfMf/a0nDFry3JAzl+SAWQ0gTklVxNcVbfHx2pkZk66EBGQfrK33Bx1BflZ/iEDyiCwmzVtNba0X9A6ELYjB9WSkWdIqZCfPlKZMu9N//aZ6+3SDVuz/BVFsAVmtqQ4Let2QjOFiSIKXrtPqWvVT/MM=
+kirby.madstop.com,192.168.0.5 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAw9iHuAa/wepHoUzWqsvhQvSkpE4K7agrdLOWHM9mvyRQ2X3HVq5GqzAvWu4J+f0FvcLPwA9tivpxt1oSt5MOtvDM6HoM+8m3P4daBp0nlNaYR8/vHCAmX6N3RyM8FWfp+VqWyux1SooQwxYxVFy86G78ApTqNsZ+p7cHmnBYqk0=
+fedora1,192.168.0.51 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAyz1rKcApU4//j8CHYKexq4qnq2WVqLPrZYGnlij1t7FscLiDVKvBuRHVkfyTNIjAM/t7tM1Dj+FuD4iWziCmf7RO9q4wI5y/1zgCiSUegnZVSmH2yxnWGMdHGpXOkN3NXcpy6jylxyBo0M7T22PSezCxyUVfMclesjOEO1jETd0=
+kirby ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAw9iHuAa/wepHoUzWqsvhQvSkpE4K7agrdLOWHM9mvyRQ2X3HVq5GqzAvWu4J+f0FvcLPwA9tivpxt1oSt5MOtvDM6HoM+8m3P4daBp0nlNaYR8/vHCAmX6N3RyM8FWfp+VqWyux1SooQwxYxVFy86G78ApTqNsZ+p7cHmnBYqk0=
+sol10b,192.168.0.50 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAs37kiDwKxWqi6EfSdKwRaZXBwh2doOARRqZzyitBaPwESy26DwTx+xdQ2rwB4V2k1WIec+1f3bgTS2ArH75dQSPyba2HKqxaSRBd3Zh4z23+uUxpupEyoRdW1HolMOvuoceheSMsruiuYcuiyct41d4c/Qmr51Dv04Doi00k6Ws=
+piratehaven.org,64.81.59.88 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA7TYRRkle0wDNohZ0TNZN6R1Zp0svxgX+GJ9umI5yNM1bMxUTgeNRh5nIvZg1HgD1WRXQ57dSxxLzbvRyAqc245g6S8eWWCtenvOFLl0rOF5D3VxbQuw79sOe8/Ac8TC+c8RuWB7aaxpwL5Rv9xfDeazOtoKXj7+uwQW1PUmTaEM=
+atalanta,192.168.0.10 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAysniuWiJH6OQLXl63XXcS1b/hP2lAgSz0IutjQ6ZUfBrt1BZ8udEgSh57w5QDLsZ1lNvND61u5cy6iDKXI5TIQY4DvUmsoFZhyr4iYJbtT/h6UJSyaZtEnA7ZMRjGhUIMOn+mjbj7Z3zmJMhxtImK3Xo3O2fJ1hnK4jsBwQPSLc=
+pixie,192.168.0.9 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAzDp588CvET6w11LB2s/vPjc4tX9+u46iYJgNFfhzxrXYMVv4GF7d30IXB5+Hwyi2FOQIG1+h0kUXVGWEv64rAFBT7pD2KMFX0lcDERV4avqT0TRDIIA5OqFOhq9Ff+kOmHS2cB7eFyR5vqbN4ujOnJGTmru9dcqyL+2AcFekvh0=
+culain,192.168.0.3 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAvJ/IORhQMdAsJ7LB1sI2LlWUHc7HPTCDiEgJ96ij3jFvqaIiYieRFaNkxbbk75mPkj3vIqWIgAsAtHmKX4wDikNG/gyjs4WM4cWFKtl2jiVhqpoxqqCaVxs6Ex+vpKuKhQR6SzFBFDlBZYP9an6DPu1msTLT8/hZH2WwswVmpyU=
+cs312-server.een.orst.edu,128.193.40.66 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA+t3hsOiyp1mztt013bLdJqIAFCo8lxlz86MYEPz/mADHzWLs3Xv7xpAUv/E8pRbhEOzXo84EddORRBXz6DgVyMah8+v/u3IOkpXuZI0Iu1n5hZyf2l5DGEyGecr3oqqjUdMuM9HeXFLnqXJI3hDE7civBtqf5AJSol+TCcipeE8=
+freebsd1,192.168.0.52 ssh-dss AAAAB3NzaC1kc3MAAACBAJSiOyQhYlKAi0FDLKy42VzLDq6yJWXGXVCLSfgWyVx7QCq/3+W3C1dtHuAvjbypcjqqvsuGGITgQ1Y6B/+76n5d7FyQnj4SFZ5drOBn/TvslXhrS/Ok5KCcndfNAa+EyMnSZJ21jhoRjZftY4lmb4hy6fEF3RvjuOdf1qBN5FWpAAAAFQDcsWF0zELAW6YUlSjAyO0T0lfPbwAAAIAlOLdOd/WszzVaplCOnH5vF6LWfr6BosZKDkFi0mv6Ec636YGaj4AMxK8sRPusHv6sVByN17ntIJnLo2XD1SuoH28bZ0ZnPIdVnd0l1KqsOCuuow9LZYJUihezoUuYuTvij1jZdrwltuPNJTVLYtsZDnKE5plw+Tjzeb7ImjbXGwAAAIBT40olg3fxhRDiZECle0WK7GitgXCB3njs+4dba8VwveEJb9UuulMc1eR+zQiJR96IUBagC9NiLvUGS1IfiIHpT4FA8O/MK1W9SgxXB9d39Nk/9l8dH3U/fLnbC/hYVo8bN0or/mKxcxQMkdBwpPlWAbELRftod2BkkkvgfQdc+g==
+192.168.0.2 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgwCZ+qxpMMRJ3otGsjaYeKTKf6tuCZyK1cD+ns9Eu7V0ZJLJ/LLMxduu7n4H/ufGI5rGV5axzgx8yZhjDRzsrGjLAQYsqlomMkf901YQI6UuieSA4MZa5MDkq/Jt6Vx1kEGTpkgrfw9kRMX5BngECt1QKY4xTgC7Ex+WlFvZwk+tRUT3
+openbsd1,192.168.0.54 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvgRVrtJk0fBg9YsLf7rWR1X32ZjFcva5XBvenDlHruObaHzuGXyyr6iOCAEOc7eCZjlPBYrGZ2potqyk8HlBOHXr1cCBf49t4yAt8KgKswtzWlgdbU1UEwllSRVOpzqULAT0smv/jfaIZdvRoN1rLriqtpn4bQL//ZOHiyXCwdlJ+di8Mza2L8KZ5T75hwIFBhrgL12xfymRp3v+Iy21MjjzsF3pROIkZ7icitNqQF55U9vsHaA37vG8FepVkO10bYYP7IHPZaBPBMPx7qPyRgRDJahEUGBnkIkzwJHEmA+7YMiNTZu6MigezD+CIqY1xOi/eXZwObLwLKXo7eRmpw==
+192.168.0.60 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAufcvE7s1eRwhUwMBfZ6uFNxkdSdzjSDEn3vjByOjG/eraNhnYAW3rxV7WIf2pEa6JSOMrE1mqsEL75xEtpXlzC949Ysz4+1OSHY52KonoFm/a+FbmbFp81TVuVPYaLoeWN27STiJh+puC5spkIZe0laqT1GU13M4gj6B+j3NLhU=
+rh3a,192.168.0.55 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAufcvE7s1eRwhUwMBfZ6uFNxkdSdzjSDEn3vjByOjG/eraNhnYAW3rxV7WIf2pEa6JSOMrE1mqsEL75xEtpXlzC949Ysz4+1OSHY52KonoFm/a+FbmbFp81TVuVPYaLoeWN27STiJh+puC5spkIZe0laqT1GU13M4gj6B+j3NLhU=
+tsetse,192.168.0.7 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwCDGn82BEMSCfcE2LZKcwdAoyIBC+u2twVwWNRm3KzyrJMQ+RbTQo4AwGOdyr/QYh6KaxTKTSoDtiBLr132uenMQKwF47gCKMA1T47uiy+TBUehgOGwOxteSYP/pQRpKXFmhOppSPyDPQVq234XvANeJp0iT8ZKEhF2FsWTs6sM=
+config.sage.org,131.106.3.205 ssh-dss AAAAB3NzaC1kc3MAAACBAL2akEcIfQsfm3zCd2hD6PgH3kWA/tqX/qbrLhL/ipX7iqK/y282GMClZQSQjc1YNi9virvLzb6u/gdZxicZ8K5O3FaJrULQJOZaP62SOHk5CUSHVnvpMCaCnbwB6gEHa2LeMWStcEfWW+g1CC2hzPJw16/S5GISGXbyanO02MnXAAAAFQDomwx/OCjTmmQljMTU5rgNn2E4gwAAAIBmtMSfcs2Tq5iFFKK5cahluv047vVNfXqYIAkeJniceL0Et16MKfuzadpq0H9ocxQYW/5Ir9nUULrdxBUN9LxNKq15/uWkJC9QCSh8PysgvFnjVZeCODua/dn6eZTZnY9DZ3S6v1pT8CP6uWr5fmZJ8FKJGrC3gYX4y1V1ZTCVewAAAIB6e7RCST6vkTS5rgn5wGbrfLK5ad+PW+2i66k77Zv1pjtfRz+0oejBjwJDPNVSc2YNEl7X0nEEMNjo/a5x8Ls+nVqhzJA+NXIwS1e/moKbXFGewW5HAtxd79gtInC8dEIO7hmnWnqF1dBkRHXg1YffYkHrMVJBxpzagw7nYa0BBQ==
+rh3b,192.168.0.56 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAufcvE7s1eRwhUwMBfZ6uFNxkdSdzjSDEn3vjByOjG/eraNhnYAW3rxV7WIf2pEa6JSOMrE1mqsEL75xEtpXlzC949Ysz4+1OSHY52KonoFm/a+FbmbFp81TVuVPYaLoeWN27STiJh+puC5spkIZe0laqT1GU13M4gj6B+j3NLhU=
+centos1,192.168.0.57 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA0DXqYF+3Lf68GkWBAjjKBb6UITNnzm4wiDi/AGjv5+DoVXqDcqHvZ8rZFAMgUe1dVob4pWT2ZWLHW0gicoJCdr4UQbPXlWz1F62z8fo2PRRPlG6KN1wmF7pnyml8jr0wBX8lQZJsMqi4InGozf7wFHLH/7DNGRK3MD6tSp3Z4is=
+doorstop.cafes.net,205.241.238.186 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEApJKeB9/bN5t55zLETHs0MVo/vEkfQ3EzY7178GKLI/yiOFmcn+NvUvUtCQK/xKpod813LBHCODxZPG1Kb0SjlaC/EkFEenb74LNu0o1qXa1GWh3wfaIm0JRNjXqPqxAWTlMs43O2HXwOwmLVhl7SSP3xtTw6h9gREbVKmfBaRdsRfzD0etfz1NCnmGh/1Sh9+j4eeS+IBtwoR5JVhZVhuofHCqs5HZ8gLDgfn8HXP7pMbLkx54cf1R/tmFmn9JGLdTPtEGcSIiu7414XSbfChSC83rGZCDPKHq7ZodiE8GpbWLBnyPXi2AYxTPM7aZMqitIHv3MWf5suV0q0WLGdnQ==
+host.domain.com,host1.domain.com,192.168.0.1 dss thisismykey1

data/spec/fixtures/unit/data_providers/environments/production/environment.conf

@@ -0,0 +1,2 @@
+environment_timeout = 0
+environment_data_provider = 'function'

data/spec/fixtures/unit/data_providers/environments/production/lib/puppet/functions/environment/data.rb

@@ -0,0 +1,7 @@
+Puppet::Functions.create_function(:'environment::data') do
+  def data()
+    { 'abc::def::test1' => 'env_test1',
+      'abc::def::test2' => 'env_test2'
+    }
+  end
+end

data/spec/fixtures/unit/data_providers/environments/production/modules/abc/lib/puppet/bindings/abc/default.rb

@@ -0,0 +1,9 @@
+Puppet::Bindings.newbindings('abc::default') do
+  # In the default bindings for this module
+  bind {
+    # bind its name to the 'puppet' environment data provider
+    name         'abc'
+    to           'function'
+    in_multibind 'puppet::module_data'
+ }
+end

data/spec/fixtures/unit/data_providers/environments/production/modules/abc/lib/puppet/functions/abc/data.rb

@@ -0,0 +1,8 @@
+Puppet::Functions.create_function(:'abc::data') do
+  def data()
+    { 'abc::def::test1' => 'module_test1',
+      'abc::def::test2' => 'module_test2',
+      'abc::def::test3' => 'module_test3'
+    }
+  end
+end

data/spec/fixtures/unit/data_providers/environments/production/modules/abc/manifests/init.pp

@@ -0,0 +1,9 @@
+class abc {
+  include 'abc::def'
+}
+
+class abc::def ($test1, $test2, $test3) {
+  notify { $test1: }
+  notify { $test2: }
+  notify { $test3: }
+}

data/spec/fixtures/unit/data_providers/environments/sample/environment.conf

@@ -0,0 +1,2 @@
+# Use the 'sample' env data provider (in this fixture)
+environment_data_provider=sample

data/spec/fixtures/unit/data_providers/environments/sample/manifests/site.pp

@@ -0,0 +1,6 @@
+class test($param_a = 1, $param_b = 2, $param_c = 3) {
+  notify { "$param_a, $param_b, $param_c": }
+}
+
+include test
+include dataprovider::test

data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet/bindings/dataprovider/default.rb

@@ -0,0 +1,54 @@
+# This registers the default bindings for this module.
+# These bidnings are loaded at the start of a Puppet
+# catalog production.
+# 
+# The registrations makes 'sample' available as both a
+# data provider for an environment, and individually
+# selectable in modules.
+#
+# Note that there are two different implementation classes
+# registered, one for environment, and one for modules.
+#
+# Also note that all data are strings including the names
+# of the classes that implement the provider logic. This
+# is to not cause loading of those classes until they
+# are needed.
+#
+Puppet::Bindings.newbindings('dataprovider::default') do
+
+  # Make the SampleEnvData provider available for use in environments
+  # as 'sample'.
+  #
+  bind {
+    name 'sample'
+    in_multibind 'puppet::environment_data_providers'
+    to_instance 'PuppetX::Helindbe::SampleEnvData'
+  }
+
+  # Make the SampleModuleData provider available for use in environments
+  # as 'sample'.
+  #
+  bind {
+    name 'sample'
+    in_multibind 'puppet::module_data_providers'
+    to_instance 'PuppetX::Helindbe::SampleModuleData'
+  }
+
+  # This is what users of the 'sample' module data provider should
+  # use in its default.rb bindings. The module providing the implementation
+  # of this data provider typically does not have any puppet logic, so it
+  # would not have this binding. This example module has this however since
+  # it would otherwise require an additional module with just some puppet code
+  # and this binding to demonstrate the functionality.
+  #
+  # This binding declares that this module wants to use the 'sample' data provider
+  # for this module. (Thus ending up using the SampleModuleData implementation
+  # bound above in this example).
+  # 
+  bind {
+    name 'dataprovider'
+    to 'sample'
+    in_multibind 'puppet::module_data'
+  }
+end
+

data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_env_data.rb

@@ -0,0 +1,31 @@
+# The module is named after the author, to ensure that names under PuppetX namespace
+# does not clash.
+#
+require 'puppet_x'
+module PuppetX::Helindbe
+
+  # An env data provider that is hardcoded and provides data for
+  # the two names 'test::param_a' and 'test::param_b'.
+  #
+  # A real implementation would read the data from somewhere or invoke some
+  # other service to obtain the data. When doing so caching may be performance
+  # critical, and it is important that a cache is associated with the apropriate
+  # object to not cause memory leaks. See more details in the documentation
+  # for how to write a data provider and use adapters.
+  #
+  class SampleEnvData < Puppet::Plugins::DataProviders::EnvironmentDataProvider
+    def initialize()
+      @data = { 
+        'test::param_a' => 'env data param_a is 10',
+        'test::param_b' => 'env data param_b is 20',
+        # demo: this overrides a parameter for a class in the dataprovider module
+        'dataprovider::test::param_c' => 'env data param_c is 300',
+      }
+    end
+
+    def lookup(name, scope, merge)
+      @data[name]
+    end
+  end
+end
+

data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_module_data.rb

@@ -0,0 +1,32 @@
+# The module is named after the author, to ensure that names under PuppetX namespace
+# does not clash.
+#
+require 'puppet_x'
+module PuppetX::Helindbe
+
+  # A module data provider that is hardcoded and provides data for
+  # the three names 'test::param_a', 'test::param_b', and 'test::param_c'
+  #
+  # A real implementation would read the data from somewhere or invoke some
+  # other service to obtain the data. When doing so caching may be performance
+  # critical, and it is important that a cache is associated with the apropriate
+  # object to not cause memory leaks. See more details in the documentation
+  # for how to write a data provider and use adapters.
+  #
+  class SampleModuleData < Puppet::Plugins::DataProviders::ModuleDataProvider
+    def initialize()
+      @data = { 
+        'dataprovider::test::param_a' => 'module data param_a is 100',
+        'dataprovider::test::param_b' => 'module data param_b is 200',
+
+        # demo: uncomment the entry below to make it override the environment provided data
+        #'dataprovider::test::param_c' => 'env data param_c is 300',
+      }
+    end
+
+    def lookup(name, scope, merge)
+      @data[name]
+    end
+  end
+end
+

data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/manifests/init.pp

@@ -0,0 +1,5 @@
+class dataprovider {
+  class test($param_a = 1, $param_b = 2, $param_c = 3) {
+    notify { "$param_a, $param_b, $param_c": }
+  }
+}

data/spec/fixtures/unit/functions/lookup/environments/production/environment.conf

@@ -0,0 +1,2 @@
+environment_timeout = 0
+environment_data_provider = 'function'

data/spec/fixtures/unit/functions/lookup/environments/production/lib/puppet/functions/environment/data.rb

@@ -0,0 +1,11 @@
+Puppet::Functions.create_function(:'environment::data') do
+  def data()
+    { 'a' => 'env_a',
+      'c' => 'env_c',
+      'd' => { 'k1' => 'env_d1', 'k2' => 'env_d2', 'k3' => 'env_d3' },
+      'e' => { 'k1' => 'env_e1', 'k3' => 'env_e3' },
+      'f' => { 'k1' => { 's1' => 'env_f11', 's2' => 'env_f12' },  'k2' => { 's1' => 'env_f21', 's3' => 'env_f23' }},
+      'n' => nil
+    }
+  end
+end

data/spec/fixtures/unit/functions/lookup/environments/production/modules/abc/lib/puppet/bindings/abc/default.rb

@@ -0,0 +1,9 @@
+Puppet::Bindings.newbindings('abc::default') do
+  # In the default bindings for this module
+  bind {
+    # bind its name to the 'puppet' module data provider
+    name         'abc'
+    to           'function'
+    in_multibind 'puppet::module_data'
+ }
+end

data/spec/fixtures/unit/functions/lookup/environments/production/modules/abc/lib/puppet/functions/abc/data.rb

@@ -0,0 +1,9 @@
+Puppet::Functions.create_function(:'abc::data') do
+  def data()
+    { 'b' => 'module_b',
+      'c' => 'module_c',
+      'e' => { 'k1' => 'module_e1', 'k2' => 'module_e2' },
+      'f' => { 'k1' => { 's1' => 'module_f11', 's3' => 'module_f13' },  'k2' => { 's1' => 'module_f21', 's2' => 'module_f22' }},
+    }
+  end
+end

data/spec/fixtures/unit/functions/lookup/environments/production/modules/abc/manifests/init.pp

@@ -0,0 +1,8 @@
+class abc {
+  if $block != 'no_block_present' {
+    $result = lookup(*$args) |$names| { if $block == true { $names } else { $block } }
+  }
+  else {
+    $result = lookup(*$args)
+  }
+}

data/spec/fixtures/unit/pops/binder/bindings_composer/ok/binder_config.yaml

@@ -7,4 +7,4 @@ layers:
   ]
 extensions:
   scheme_handlers:
-    echo: 'Puppetx::Awesome2::EchoSchemeHandler'
+    echo: 'PuppetX::Awesome2::EchoSchemeHandler'

data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome2/lib/{puppetx → puppet_x}/awesome2/echo_scheme_handler.rb

@@ -1,12 +1,12 @@
-require 'puppetx/puppet/bindings_scheme_handler'
+require 'puppet/plugins/binding_schemes'
 
-module Puppetx
+module PuppetX
   module Awesome2
     # A binding scheme that echos its path
     # 'echo:/quick/brown/fox' becomes key '::quick::brown::fox' => 'echo: quick brown fox'.
     # (silly class for testing loading of extension)
     #
-    class EchoSchemeHandler < Puppetx::Puppet::BindingsSchemeHandler
+    class EchoSchemeHandler < Puppet::Plugins::BindingSchemes::BindingsSchemeHandler
       def contributed_bindings(uri, scope, composer)
         factory = ::Puppet::Pops::Binder::BindingsFactory
         bindings = factory.named_bindings("echo")

data/spec/fixtures/unit/pops/binder/config/binder_config/nolayer/binder_config.yaml

@@ -0,0 +1,6 @@
+---
+version: 1
+categories:
+  - ['node', '$fqn']
+  - ['environment', '$environment']
+  - ['common', 'true']

data/spec/fixtures/unit/provider/mount/parsed/aix.filesystems

@@ -35,118 +35,110 @@
 *
 
 /:
-	dev		= /dev/hd4
-	vfs		= jfs2
-	check		= false
-	free		= true
-	log		= NULL
-	mount		= automatic
-	quota		= no
-	type		= bootfs
-	vol		= root
+        dev             = /dev/hd4
+        vfs             = jfs2
+        log             = /dev/hd8
+        mount           = automatic
+        check           = false
+        type            = bootfs
+        vol             = root
+        free            = true
+        quota           = no
 
 /home:
-	dev		= /dev/hd1
-	vfs		= jfs2
-	check		= true
-	free		= false
-	log		= NULL
-	mount		= true
-	quota		= no
-	vol		= /home
+        dev             = /dev/hd1
+        vfs             = jfs2
+        log             = /dev/hd8
+        mount           = true
+        check           = true
+        vol             = /home
+        free            = false
+        quota           = no
 
 /usr:
-	dev		= /dev/hd2
-	vfs		= jfs2
-	check		= false
-	free		= false
-	log		= NULL
-	mount		= automatic
-	quota		= no
-	type		= bootfs
-	vol		= /usr
+        dev             = /dev/hd2
+        vfs             = jfs2
+        log             = /dev/hd8
+        mount           = automatic
+        check           = false
+        type            = bootfs
+        vol             = /usr
+        free            = false
+        quota           = no
 
 /var:
-	dev		= /dev/hd9var
-	vfs		= jfs2
-	check		= false
-	free		= false
-	log		= NULL
-	mount		= automatic
-	quota		= no
-	type		= bootfs
-	vol		= /var
+        dev             = /dev/hd9var
+        vfs             = jfs2
+        log             = /dev/hd8
+        mount           = automatic
+        check           = false
+        type            = bootfs
+        vol             = /var
+        free            = false
+        quota           = no
 
 /tmp:
-	dev		= /dev/hd3
-	vfs		= jfs2
-	check		= false
-	free		= false
-	log		= NULL
-	mount		= automatic
-	quota		= no
-	vol		= /tmp
+        dev             = /dev/hd3
+        vfs             = jfs2
+        log             = /dev/hd8
+        mount           = automatic
+        check           = false
+        vol             = /tmp
+        free            = false
+        quota           = no
 
 /admin:
-	dev		= /dev/hd11admin
-	vfs		= jfs2
-	check		= false
-	free		= false
-	log		= NULL
-	mount		= true
-	quota		= no
-	vol		= /admin
+        dev             = /dev/hd11admin
+        vfs             = jfs2
+        log             = /dev/hd8
+        mount           = true
+        check           = false
+        vol             = /admin
+        free            = false
+        quota           = no
 
 /proc:
-	dev		= /proc
-	vol		= "/proc"
-	mount		= true
-	check		= false
-	free		= false
-	vfs		= procfs
+        dev       = /proc
+        vol       = "/proc"
+        mount     = true
+        check     = false
+        free      = false
+        vfs       = procfs
 
 /opt:
-	dev		= /dev/hd10opt
-	vfs		= jfs2
-	log		= /dev/hd8
-	mount		= true
-	check		= true
-	vol		= /opt
-	free		= false
-	quota		= no
+        dev             = /dev/hd10opt
+        vfs             = jfs2
+        log             = /dev/hd8
+        mount           = true
+        check           = true
+        vol             = /opt
+        free            = false
+        quota           = no
 
 /var/adm/ras/livedump:
-	dev		= /dev/livedump
-	vfs		= jfs2
-	log		= /dev/hd8
-	mount		= true
-	account		= false
-	quota		= no
+        dev             = /dev/livedump
+        vfs             = jfs2
+        log             = /dev/hd8
+        mount           = true
+        account         = false
+        quota           = no
 
 
 /stage/middleware:
-	dev		= "/stage/middleware"
-	vfs		= nfs
-	nodename	= 192.168.1.11
-	mount		= true
-	type		= nfs
-	options		= ro,bg,hard,intr,sec=sys
-	account		= false
+        dev             = "/stage/middleware"
+        vfs             = nfs
+        nodename        = 192.168.1.11
+        mount           = true
+        type            = nfs
+        options         = ro,bg,hard,intr,sec=sys
+        account         = false
 
 /home/u0010689:
-	dev		= "/userdata/20010689"
-	vfs		= nfs
-	nodename	= 192.168.1.11
-	mount		= true
-	type		= nfs
-	options		= bg,hard,intr
-	account		= false
+        dev             = "/userdata/20010689"
+        vfs             = nfs
+        nodename        = 192.168.1.11
+        mount           = true
+        type            = nfs
+        options         = bg,hard,intr
+        account         = false
 
-/srv/aix:
-	dev		= /srv/aix
-	nodename	= mynode
-	vfs		= nfs
-	account		= false
-	log		= NULL
-	mount		= true
-	options		= vers=2