Skip to content

Commit 949d76d

Browse files
committed
Add support for mounting from /etc/fstab
Fixes: #92.
1 parent 848ff30 commit 949d76d

File tree

4 files changed

+32
-0
lines changed

4 files changed

+32
-0
lines changed

Diff for: ChangeLog.rst

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Unreleased Changes
22
------------------
33

4+
* Add support for mounting from /etc/fstab
45
* Dropped support for building with autotools.
56
* Added missing options to man page.
67

Diff for: meson.build

+4
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ else
6363
message('rst2man not found, not building manual page.')
6464
endif
6565

66+
meson.add_install_script('utils/install_helper.sh',
67+
get_option('sbindir'),
68+
get_option('bindir'))
69+
6670

6771
subdir('test')
6872

Diff for: sshfs.rst

+8
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,14 @@ without SSHFS being informed about that. As a workaround, you can try
253253
to mount with ``-o ServerAliveInterval=15``. This will force the SSH
254254
connection to stay alive even if you have no activity.
255255

256+
Mounting from /etc/fstab
257+
========================
258+
259+
To mount an SSHFS filesystem from ``/etc/fstab``, simply use ``sshfs`
260+
as the file system type. (For backwards compatibility, you may also
261+
use ``fuse.sshfs``).
262+
263+
256264
See also
257265
========
258266

Diff for: utils/install_helper.sh

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/sh
2+
#
3+
# Don't call this script. It is used internally by the Meson
4+
# build system. Thank you for your cooperation.
5+
#
6+
7+
set -e
8+
9+
bindir="$2"
10+
sbindir="$1"
11+
prefix="${MESON_INSTALL_DESTDIR_PREFIX}"
12+
13+
mkdir -p "${prefix}/${sbindir}"
14+
15+
ln -svf --relative "${prefix}/${bindir}/sshfs" \
16+
"${prefix}/${sbindir}/mount.sshfs"
17+
18+
ln -svf --relative "${prefix}/${bindir}/sshfs" \
19+
"${prefix}/${sbindir}/mount.fuse.sshfs"

0 commit comments

Comments
 (0)