~ubuntu-branches/ubuntu/lucid/puppet/lucid-security

« back to all changes in this revision

Viewing changes to test/data/types/mount/freebsd.fstab

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-12-23 00:48:10 UTC
  • mfrom: (1.1.10 upstream) (3.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091223004810-3i4oryds922g5n59
Tags: 0.25.1-3ubuntu1
* Merge from debian testing.  Remaining changes:
  - debian/rules:
    + Don't start puppet when first installing puppet.
  - debian/puppet.conf, lib/puppet/defaults.rb:
    + Move templates to /etc/puppet
  - lib/puppet/defaults.rb:
    + Fix /var/lib/puppet/state ownership.
  - man/man8/puppet.conf.8: 
    + Fix broken URL in manpage.
  - debian/control:
    + Update maintainer accordint to spec.
    + Puppetmaster Recommends -> Suggests
    + Created puppet-testsuite as a seperate. Allow the users to run puppet's 
      testsuite.
  - tests/Rakefile: Fix rakefile so that the testsuite can acutally be ran.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Device                Mountpoint      FStype  Options         Dump    Pass#
2
 
/dev/ad0s1b             none            swap    sw              0       0
3
 
/dev/ad0s1a             /               ufs     rw              1       1
4
 
/dev/ad0s1e             /tmp            ufs     rw              2       2
5
 
/dev/ad0s1f             /usr            ufs     rw              2       2
6
 
/dev/ad0s1d             /var            ufs     rw              2       2
7
 
/dev/acd0               /cdrom          cd9660  ro,noauto       0       0
 
1
# Device                Mountpoint      FStype  Options         Dump    Pass#
 
2
/dev/ad0s1b             none            swap    sw              0       0
 
3
/dev/ad0s1a             /               ufs     rw              1       1
 
4
/dev/ad0s1e             /tmp            ufs     rw              2       2
 
5
/dev/ad0s1f             /usr            ufs     rw              2       2
 
6
/dev/ad0s1d             /var            ufs     rw              2       2
 
7
/dev/acd0               /cdrom          cd9660  ro,noauto       0       0