github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-08-03 16:00:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14 from dsheets/9pudfuse

Browse Source 
9pudfuse updates
This commit is contained in:
Justin Cormack 2016-01-25 17:19:41 +00:00
commit 79bbb3d841
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
alpine/packages/9pinit/etc/init.d/9pinit
View File

@ -18,7 +18,8 @@ start()
;; ;;
"fuse") "fuse")
mkdir -p /Transfuse mkdir -p /Transfuse
mount -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 fuse /Transfuse mkdir -p /Mac
mount -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000,msize=32768 fuse /Transfuse
;; ;;
"db") "db")
mkdir -p /Database mkdir -p /Database

1
alpine/packages/9pudfuse/etc/init.d/9pudfuse
View File

@ -20,7 +20,6 @@ start()
# --pidfile "${PIDFILE}" \ # --pidfile "${PIDFILE}" \
# -- -path /Transfuse # -- -path /Transfuse
# eend $? "Failed to start 9pudfuse" # eend $? "Failed to start 9pudfuse"
mkdir -p /Mac
OCAMLRUNPARAM=b /sbin/9pudfuse & OCAMLRUNPARAM=b /sbin/9pudfuse &
} }

15
alpine/packages/9pudfuse/fuse_socket_9p.ml
View File

@ -38,11 +38,11 @@ let finally f at_end =
let copy description dst src = let copy description dst src =
let sz = 1 lsl 16 in let sz = 1 lsl 16 in
let buf = Bytes.create sz in let buf = Bytes.create sz in
let pnum = ref 0 in (*let pnum = ref 0 in*)
let rec loop () = let rec loop () =
let n = Unix.read src buf 0 sz in let n = Unix.read src buf 0 sz in
(if n = 0 then raise ReadClosed); (if n = 0 then raise ReadClosed);
(*
let fd = Unix.( let fd = Unix.(
openfile ("/tmp/"^description^"_"^(string_of_int !pnum)) openfile ("/tmp/"^description^"_"^(string_of_int !pnum))
[O_WRONLY; O_CREAT] 0o600) in [O_WRONLY; O_CREAT] 0o600) in
@ -50,8 +50,15 @@ let copy description dst src =
assert (k = n); assert (k = n);
Unix.close fd; Unix.close fd;
incr pnum; incr pnum;
*)
let written = Unix.write dst buf 0 n in let written = try
Unix.write dst buf 0 n
with
| Unix.Unix_error (Unix.EINVAL, "write", _) ->
failwith ("copy write for "^description^" failed with EINVAL")
| Unix.Unix_error (Unix.ENOENT, "write", _) ->
failwith ("copy write for "^description^" failed with ENOENT")
in
(if n <> written (if n <> written
then Log.error "copy of %s read %d but wrote %d" description n written); then Log.error "copy of %s read %d but wrote %d" description n written);
loop () loop ()