diff options
| author | Paul Berry <paul@puppetlabs.com> | 2011-02-25 15:14:26 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2011-02-25 15:14:26 -0800 |
| commit | a949a83c4f100be0254fadcb915f418f73705861 (patch) | |
| tree | 9dc03431bd00fb2293bd6397a1dadae5d10461d6 /spec/fixtures/unit/provider/mount/mount-output.other.txt | |
| parent | 96e9f8f4feab5d768fff304fdb129405596ba128 (diff) | |
| download | puppet-a949a83c4f100be0254fadcb915f418f73705861.tar.gz puppet-a949a83c4f100be0254fadcb915f418f73705861.tar.xz puppet-a949a83c4f100be0254fadcb915f418f73705861.zip | |
Revert "(#6309) Ensure the correct device is mounted when managing mounts"
This reverts commit 6cb365a887d47606bdfae0ff540038b0c49b7451, which
fixed bug #6309 but introduced bug #6411. In addition, it conflicts
with a significant patch to the mount provider that addresses #4914.
After merging in the fix for #4914 I will determine whether bug #6309
still exists, and if so work on an improved fix for it.
Diffstat (limited to 'spec/fixtures/unit/provider/mount/mount-output.other.txt')
| -rw-r--r-- | spec/fixtures/unit/provider/mount/mount-output.other.txt | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/spec/fixtures/unit/provider/mount/mount-output.other.txt b/spec/fixtures/unit/provider/mount/mount-output.other.txt deleted file mode 100644 index 0e4dff0c5..000000000 --- a/spec/fixtures/unit/provider/mount/mount-output.other.txt +++ /dev/null @@ -1,14 +0,0 @@ -/dev/sda1 on / type ext4 (rw,errors=remount-ro,commit=0) -proc on /proc type proc (rw,noexec,nosuid,nodev) -none on /sys type sysfs (rw,noexec,nosuid,nodev) -fusectl on /sys/fs/fuse/connections type fusectl (rw) -none on /sys/kernel/debug type debugfs (rw) -none on /sys/kernel/security type securityfs (rw) -none on /dev type devtmpfs (rw,mode=0755) -none on /dev/pts type devpts (rw,noexec,nosuid,gid=5,mode=0620) -none on /dev/shm type tmpfs (rw,nosuid,nodev) -none on /var/run type tmpfs (rw,nosuid,mode=0755) -none on /var/lock type tmpfs (rw,noexec,nosuid,nodev) -none on /proc/fs/vmblock/mountPoint type vmblock (rw) -binfmt_misc on /proc/sys/fs/binfmt_misc type binfmt_misc (rw,noexec,nosuid,nodev) -/dev/sda2 on /usr type ext4 (rw,errors=remount-ro,commit=0) |