search for: root_mount

..._fs_unix_fstab.ml b/daemon/inspect_fs_unix_fstab.ml index 170440d2c..9d54dadda 100644 --- a/daemon/inspect_fs_unix_fstab.ml +++ b/daemon/inspect_fs_unix_fstab.ml @@ -38,14 +38,15 @@ let re_xdev = PCRE.compile "^/dev/(h|s|v|xv)d([a-z]+)(\\d*)$" let rec check_fstab ?(mdadm_conf = false) (root_mountable : Mountable.t) os_type = - let configfiles = - "/etc/fstab" :: if mdadm_conf then ["/etc/mdadm.conf"] else [] in + let mdadmfiles = + if mdadm_conf then ["/etc/mdadm.conf"; "/etc/mdadm/mdadm.conf"] else [] in + let configfile...

No change, just reposting without the "for discussion" tag. I think we should allow this as it seems like a nice coding style for a limited subset of imperative-style code. Rich.

When rewriting the heavily imperative original inspection code, I longed for a ‘return’ statement so I could keep the new code as close as possible to the original. OCaml of course does not have such a statement, but it's relatively simply to implement it in the language. The first patch does so, and the second patch rewrites a sample of the inspection code to use it. Rich.

...++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/daemon/inspect_fs_unix_fstab.ml b/daemon/inspect_fs_unix_fstab.ml index edb797e3f..170440d2c 100644 --- a/daemon/inspect_fs_unix_fstab.ml +++ b/daemon/inspect_fs_unix_fstab.ml @@ -115,12 +115,20 @@ and check_fstab_entry md_map root_mountable os_type aug entry = if String.is_prefix spec "UUID=" then ( let uuid = String.sub spec 5 (String.length spec - 5) in let uuid = shell_unquote uuid in - Mountable.of_device (Findfs.findfs_uuid uuid) + (* Just ignore the device if the UUID cannot b...

...} } -> m) roots + +and root_of_fs = + function + | { fs_location = location; role = RoleRoot data } -> + { root_location = location; inspection_data = data } + | { role = (RoleUsr _ | RoleSwap | RoleOther) } -> + invalid_arg "root_of_fs" + +and inspect_get_mountpoints root_mountable = + let root = search_for_root root_mountable in + let fstab = root.inspection_data.fstab in + + (* If no fstab information (Windows) return just the root. *) + if fstab = [] then + [ "/", root_mountable ] + else ( + filter_map ( + fun (mountable, mp) -> + if...

...} } -> m) roots + +and root_of_fs = + function + | { fs_location = location; role = RoleRoot data } -> + { root_location = location; inspection_data = data } + | { role = (RoleUsr _ | RoleSwap | RoleOther) } -> + invalid_arg "root_of_fs" + +and inspect_get_mountpoints root_mountable = + let root = search_for_root root_mountable in + let fstab = root.inspection_data.fstab in + + (* If no fstab information (Windows) return just the root. *) + if fstab = [] then + [ "/", root_mountable ] + else ( + filter_map ( + fun (mountable, mp) -> + if...

...ULL) { reply_with_perror ("malloc"); return -1; } r = command (NULL, &err, "umount", buf, NULL); if (r == -1) { reply_with_error ("umount: %s: %s", pathordevice, err); free (err); free (buf); return -1; } free (err); /* update root_mounted? */ return 0; }

...be possible to move the above loop in an own helper function, so the check_$OS functions of other OSes can have their own counterpart of linux_root_tests? It is true that we don't add new identifications often, but since it's already implemented here... > +and check_fstab_entry md_map root_mountable os_type aug entry = > + if verbose () then > + eprintf "check_fstab_entry: augeas path: %s\n%!" entry; > + > + let is_bsd = > + os_type = OS_TYPE_FREEBSD || > + os_type = OS_TYPE_NETBSD || > + os_type = OS_TYPE_OPENBSD in 'match' here? --...

v2 -> v3: - Renamed List.assoc_ -> List.assoc_lbl. - Rebased on top of current master branch. Rich.

....c b/daemon/mount.c index d1b26fa..f593812 100644 --- a/daemon/mount.c +++ b/daemon/mount.c @@ -48,6 +48,8 @@ do_mount_vfs (const char *options, const char *vfstype, char *mp; char *error; + ABS_PATH (mountpoint, return -1); + is_root = strcmp (mountpoint, "/") == 0; if (!root_mounted && !is_root) { -- 1.6.2.5

This is the (incomplete) patch which reimplements inspection APIs in the daemon. All ‘XXX’s in this patch indicate areas which are not yet implemented or need further work. Rich.

In Std_utils we already extend Char and String. These commits take it a little further by extending List and adding a new Option submodule. All basically simple refactoring. Rich.

This time including the first commit ...

...is up to date. make[5]: Leaving directory `/home/rjones/d/libguestfs/generator' CC guestfsd-names.o CC guestfsd-stubs.o CC guestfsd-sync.o CCLD guestfsd guestfsd-command.o: In function `do_command': /home/rjones/d/libguestfs/daemon/command.c:39: undefined reference to `root_mounted' guestfsd-df.o: In function `do_df_h': /home/rjones/d/libguestfs/daemon/df.c:57: undefined reference to `root_mounted' guestfsd-df.o: In function `do_df': /home/rjones/d/libguestfs/daemon/df.c:36: undefined reference to `root_mounted' guestfsd-inotify.o: In function `do_inotif...

v10: https://www.redhat.com/archives/libguestfs/2017-July/msg00245.html No actual change here, but I rebased and retested. Also this series now does not depend on any other patch series since everything else needed is upstream. Rich.

v9 was here: https://www.redhat.com/archives/libguestfs/2017-July/msg00139.html This depends on these three series (the first two being single minor patches): https://www.redhat.com/archives/libguestfs/2017-July/msg00207.html https://www.redhat.com/archives/libguestfs/2017-July/msg00209.html https://www.redhat.com/archives/libguestfs/2017-July/msg00215.html There is no substantive change. I

This depends on the patch series "[PATCH 00/27] Reimplement many daemon APIs in OCaml." (https://www.redhat.com/archives/libguestfs/2017-July/msg00098.html) v8 was posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00274.html v9: - I split up the mega-patch into a more reviewable series of smaller, incremental patches. There are some other changes vs v8, but

...c index da86bd6..7b2ccea 100644 --- a/daemon/upload.c +++ b/daemon/upload.c @@ -40,7 +40,7 @@ do_upload (const char *filename) { int err, fd, r, is_dev; - is_dev = strncmp (filename, "/dev/", 5) == 0; + is_dev = STREQLEN (filename, "/dev/", 5); if (!is_dev) { if (!root_mounted || filename[0] != '/') { cancel_receive (); @@ -93,7 +93,7 @@ do_download (const char *filename) int fd, r, is_dev; char buf[GUESTFS_MAX_CHUNK_SIZE]; - is_dev = strncmp (filename, "/dev/", 5) == 0; + is_dev = STREQLEN (filename, "/dev/", 5); if (!is...

This fixes almost everything. Note that it adds an extra commit which fixes the whole utf8/iconv business. It's probably better to list what isn't fixed: (1) I didn't leave the osinfo code around because I'm still haven't looked too closely at virt-builder-repository. Can't we just fetch this code from the git history when we need it? (2) I didn't change the way

...is up to date. make[5]: Leaving directory `/home/rjones/d/libguestfs/generator' CC guestfsd-names.o CC guestfsd-stubs.o CC guestfsd-sync.o CCLD guestfsd guestfsd-command.o: In function `do_command': /home/rjones/d/libguestfs/daemon/command.c:39: undefined reference to `root_mounted' guestfsd-df.o: In function `do_df': /home/rjones/d/libguestfs/daemon/df.c:36: undefined reference to `root_mounted' guestfsd-df.o: In function `do_df_h': /home/rjones/d/libguestfs/daemon/df.c:57: undefined reference to `root_mounted' guestfsd-inotify.o: In function `do_inotif...