mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-31 14:37:59 +00:00
Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv into openelec-next
This commit is contained in:
commit
baa266621d
@ -0,0 +1,14 @@
|
|||||||
|
diff -Naur afpfs-ng-0.8.1/fuse/client.c afpfs-ng-0.8.1.patch/fuse/client.c
|
||||||
|
--- afpfs-ng-0.8.1/fuse/client.c 2008-03-08 03:44:16.000000000 +0100
|
||||||
|
+++ afpfs-ng-0.8.1.patch/fuse/client.c 2011-05-22 19:08:53.938152499 +0200
|
||||||
|
@@ -61,8 +61,8 @@
|
||||||
|
snprintf(filename, PATH_MAX,
|
||||||
|
"/usr/local/bin/%s",AFPFSD_FILENAME);
|
||||||
|
if (access(filename,X_OK)) {
|
||||||
|
- snprintf(filename, "/usr/bin/%s",
|
||||||
|
- AFPFSD_FILENAME);
|
||||||
|
+ snprintf(filename, PATH_MAX,
|
||||||
|
+ "/usr/bin/%s", AFPFSD_FILENAME);
|
||||||
|
if (access(filename,X_OK)) {
|
||||||
|
printf("Could not find server (%s)\n",
|
||||||
|
filename);
|
@ -20,7 +20,7 @@
|
|||||||
# netmount.conf
|
# netmount.conf
|
||||||
#
|
#
|
||||||
# This configuration file allows you to setup network mounts via
|
# This configuration file allows you to setup network mounts via
|
||||||
# CIFS (Samba) or NFS while the system is booting
|
# CIFS (Samba), NFS or AFP while the system is booting
|
||||||
#
|
#
|
||||||
# This is an sample file, please rename or copy this file to
|
# This is an sample file, please rename or copy this file to
|
||||||
# netmount.conf in the samba share "Configfiles" (or /storage/.config/)
|
# netmount.conf in the samba share "Configfiles" (or /storage/.config/)
|
||||||
@ -28,14 +28,16 @@
|
|||||||
# Usage:
|
# Usage:
|
||||||
# service | share on server | local mountpoint <| mount options>
|
# service | share on server | local mountpoint <| mount options>
|
||||||
#
|
#
|
||||||
# - "service" can be "nfs" for NFS mounts or "cifs" for CIFS (Samba) mounts
|
# - "service" can be "nfs" for NFS mounts, "cifs" for CIFS (Samba) or
|
||||||
|
# "afp" for AFP (Apple File Protocol) mounts
|
||||||
# - Please use an "|" as delimiter
|
# - Please use an "|" as delimiter
|
||||||
# - Don't use spaces in usernames, passwords and options
|
# - Don't use spaces in usernames, passwords and options
|
||||||
# - for NFS mounts there is no support for options
|
# - for NFS mounts there is no support for options
|
||||||
# - be aware of the different syntax for NFS shares
|
# - be aware of the different syntax for NFS and AFP mount
|
||||||
# - Local mountpoints should only be on /storage
|
# - Local mountpoints should only be on /storage
|
||||||
#
|
#
|
||||||
# Examples:
|
# Examples:
|
||||||
|
# afp | 192.168.1.44/videos | /storage/mount/videos | <username>:<password>
|
||||||
# cifs | //192.168.1.44/videos | /storage/mount/videos | username=user,pass=secret
|
# cifs | //192.168.1.44/videos | /storage/mount/videos | username=user,pass=secret
|
||||||
# cifs | //192.168.1.44/tv shows | /storage/mount/tvshows | username=user,pass=secret
|
# cifs | //192.168.1.44/tv shows | /storage/mount/tvshows | username=user,pass=secret
|
||||||
# nfs | 192.168.1.44:/videos | /storage/mount/videos
|
# nfs | 192.168.1.44:/videos | /storage/mount/videos
|
||||||
|
@ -38,6 +38,9 @@ IFS="
|
|||||||
|
|
||||||
mkdir -p $MOUNTPOINT
|
mkdir -p $MOUNTPOINT
|
||||||
case "$SERVICE" in
|
case "$SERVICE" in
|
||||||
|
afp)
|
||||||
|
mount_afp afp://$OPTIONS@$SHARE "$MOUNTPOINT" > /dev/null 2>&1 &
|
||||||
|
;;
|
||||||
cifs)
|
cifs)
|
||||||
mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1 &
|
mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1 &
|
||||||
;;
|
;;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user