diff options
author | LaMont Jones <lamont@debian.org> | 2011-01-31 20:15:49 -0700 |
---|---|---|
committer | LaMont Jones <lamont@debian.org> | 2011-01-31 20:15:49 -0700 |
commit | 11292d25510e67c83c6580401eccd42d6d6da931 (patch) | |
tree | ca5850da93c90f8798d7ff115e0124edffb8bb97 /tests/ts/libmount/files/fstab | |
parent | 4f9e177060fb5ad6e574598aefdf2d5f50a8b54f (diff) | |
parent | 9f55bf3794ca98852dd1f352f993dea60d83a2e1 (diff) | |
download | util-linux-old-11292d25510e67c83c6580401eccd42d6d6da931.tar.gz |
Merge remote branch 'origin/master'
Conflicts:
mount/mount.8
mount/mount.c
Diffstat (limited to 'tests/ts/libmount/files/fstab')
-rw-r--r-- | tests/ts/libmount/files/fstab | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/ts/libmount/files/fstab b/tests/ts/libmount/files/fstab new file mode 100644 index 00000000..2503065e --- /dev/null +++ b/tests/ts/libmount/files/fstab @@ -0,0 +1,12 @@ +UUID=d3a8f783-df75-4dc8-9163-975a891052c0 / ext3 noatime,defaults 1 1 +UUID=fef7ccb3-821c-4de8-88dc-71472be5946f /boot ext3 noatime,defaults 1 2 +UUID=1f2aa318-9c34-462e-8d29-260819ffd657 swap swap defaults 0 0 +tmpfs /dev/shm tmpfs defaults 0 0 +devpts /dev/pts devpts gid=5,mode=620 0 0 +sysfs /sys sysfs defaults 0 0 +proc /proc proc defaults 0 0 +# this is comment +/dev/mapper/foo /home/foo ext4 noatime,defaults 0 0 + +foo.com:/mnt/share /mnt/remote nfs noauto +//bar.com/gogogo /mnt/gogogo cifs user=SRGROUP/baby,noauto |