diff options
| author | William Hubbs <williamh@gentoo.org> | 2010-10-27 09:00:02 -0500 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2010-10-27 09:00:02 -0500 |
| commit | d8a76d1bf660aa376547f80f406240c67e938487 (patch) | |
| tree | 9bb6826c0e512ee68784df2e152a35eba73b3f1a | |
| parent | 7653ef89b88615874607848ad335e9a28db294fb (diff) | |
| download | openrc-d8a76d1bf660aa376547f80f406240c67e938487.tar.gz openrc-d8a76d1bf660aa376547f80f406240c67e938487.tar.bz2 openrc-d8a76d1bf660aa376547f80f406240c67e938487.tar.xz | |
allow net_fs_list to be extended but not replaced
This fixes bug #342825.
| -rw-r--r-- | etc/rc.conf.in | 10 | ||||
| -rw-r--r-- | sh/rc-functions.sh.in | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/etc/rc.conf.in b/etc/rc.conf.in index a9a80fa..60e2952 100644 --- a/etc/rc.conf.in +++ b/etc/rc.conf.in @@ -75,8 +75,14 @@ # Set unicode to YES to turn on unicode support for keyboards and screens. #unicode="NO" -# Network fstypes. Below is the default. -net_fs_list="afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs nfs nfs4 ocfs2 shfs smbfs" +# Below is the default list of network fstypes. +# +# afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs +# nfs nfs4 ocfs2 shfs smbfs +# +# If you would like to add to this list, you can do so by adding your +# own fstypes to the following variable. +#extra_net_fs_list="" ############################################################################## # SERVICE CONFIGURATION VARIABLES diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in index ee9c983..a3de2c1 100644 --- a/sh/rc-functions.sh.in +++ b/sh/rc-functions.sh.in @@ -38,7 +38,8 @@ stop_addon() ( import_addon "$1-stop" ) } -net_fs_list="afs cifs coda davfs fuse gfs ncpfs nfs nfs4 ocfs2 shfs smbfs" +net_fs_list="afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre +ncpfs nfs nfs4 ocfs2 shfs smbfs $extra_net_fs_list" is_net_fs() { [ -z "$1" ] && return 1 |