diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-09 20:23:53 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-09 20:23:53 -0300 |
| commit | 7c6a0188a5ac63d4bb6c667c2f1bcf26792312e6 (patch) | |
| tree | 706c3ba50b28eb4e1414d122b28ce69cf2c8a285 /community-testing/autofs/auto.misc | |
| parent | 25828de60b05b955dc23d7226b591b416f955875 (diff) | |
| parent | d2f2d3b5c845807249680c275031f94047f9e762 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libtextcat/PKGBUILD
extra/glsof/PKGBUILD
extra/orca/PKGBUILD
extra/python-qt/PKGBUILD
extra/python-sip/PKGBUILD
extra/python2-qt/PKGBUILD
extra/python2-sip/PKGBUILD
extra/swfdec-mozilla/PKGBUILD
extra/swfdec/PKGBUILD
extra/trayer/PKGBUILD
extra/xbill/PKGBUILD
extra/xfce4-xfapplet-plugin/PKGBUILD
Diffstat (limited to 'community-testing/autofs/auto.misc')
| -rw-r--r-- | community-testing/autofs/auto.misc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/community-testing/autofs/auto.misc b/community-testing/autofs/auto.misc new file mode 100644 index 000000000..569156626 --- /dev/null +++ b/community-testing/autofs/auto.misc @@ -0,0 +1,7 @@ +# This is an automounter map and it has the following format +# key [ -mount-options-separated-by-comma ] location +# Details may be found in the autofs(5) manpage + +cdrom -fstype=iso9660,ro,nodev,nosuid :/dev/cdrom +floppy -fstype=auto,async,nodev,nosuid,umask=000 :/dev/fl +usbstick -fstype=auto,async,nodev,nosuid,umask=000 :/dev/sda1 |