diff options
| author | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-06-30 01:43:02 +0000 |
|---|---|---|
| committer | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-06-30 01:43:02 +0000 |
| commit | 9bb9e1062a7bf747d1972d69eca9f00d2c0bd030 (patch) | |
| tree | 07d69e7b1cba6f10cbf84e300bb4f7a36058ac20 /test/data | |
| parent | f792a02aa153eedf5293791daaf355232f357cc4 (diff) | |
| download | puppet-9bb9e1062a7bf747d1972d69eca9f00d2c0bd030.tar.gz puppet-9bb9e1062a7bf747d1972d69eca9f00d2c0bd030.tar.xz puppet-9bb9e1062a7bf747d1972d69eca9f00d2c0bd030.zip | |
Fix a small bug in mount where parsing fails if dump and pass are missing (they are optional on Linux) Revamp the tests slightly so that they parse fstabs provided in svn rather than relying on the fstab on the system the test is running on.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1343 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/data')
| -rw-r--r-- | test/data/types/mount/freebsd.fstab | 7 | ||||
| -rw-r--r-- | test/data/types/mount/linux.fstab | 11 | ||||
| -rw-r--r-- | test/data/types/mount/solaris.fstab | 11 |
3 files changed, 29 insertions, 0 deletions
diff --git a/test/data/types/mount/freebsd.fstab b/test/data/types/mount/freebsd.fstab new file mode 100644 index 000000000..c39416bc8 --- /dev/null +++ b/test/data/types/mount/freebsd.fstab @@ -0,0 +1,7 @@ +# Device Mountpoint FStype Options Dump Pass# +/dev/ad0s1b none swap sw 0 0 +/dev/ad0s1a / ufs rw 1 1 +/dev/ad0s1e /tmp ufs rw 2 2 +/dev/ad0s1f /usr ufs rw 2 2 +/dev/ad0s1d /var ufs rw 2 2 +/dev/acd0 /cdrom cd9660 ro,noauto 0 0 diff --git a/test/data/types/mount/linux.fstab b/test/data/types/mount/linux.fstab new file mode 100644 index 000000000..06afe1242 --- /dev/null +++ b/test/data/types/mount/linux.fstab @@ -0,0 +1,11 @@ +# A sample fstab, typical for a Fedora system +/dev/vg00/lv00 / ext3 defaults 1 1 +LABEL=/boot /boot ext3 defaults 1 2 +devpts /dev/pts devpts gid=5,mode=620 0 0 +tmpfs /dev/shm tmpfs defaults 0 0 +LABEL=/home /home ext3 defaults 1 2 +/home /homes auto bind +proc /proc proc defaults 0 0 +/dev/vg00/lv01 /spare ext3 defaults 1 2 +sysfs /sys sysfs defaults 0 0 +LABEL=SWAP-hda6 swap swap defaults 0 0 diff --git a/test/data/types/mount/solaris.fstab b/test/data/types/mount/solaris.fstab new file mode 100644 index 000000000..c7de9671b --- /dev/null +++ b/test/data/types/mount/solaris.fstab @@ -0,0 +1,11 @@ +#device device mount FS fsck mount mount +#to mount to fsck point type pass at boot options +# +fd - /dev/fd fd - no - +/proc - /proc proc - no - +/dev/dsk/c0d0s0 /dev/rdsk/c0d0s0 / ufs 1 no - +/dev/dsk/c0d0p0:boot - /boot pcfs - no - +/devices - /devices devfs - no - +ctfs - /system/contract ctfs - no - +objfs - /system/object objfs - no - +#swap - /tmp tmpfs - yes - |