Re: [Libguestfs] [PATCH v2 3/4] sysprep: Add a new operation to remove editor backup files (RHBZ#1401320).

Remove editor backup files such as *~ and *.bak wherever they occur within the guest filesystem. This also includes a test. ---

+ let fses = + match g#inspect_get_type root with + | "hurd" + | "linux" + | "minix" -> unix_whitelist + | f when String.is_suffix f "bsd" -> unix_whitelist + | _ -> ["/"] in

+ List.iter ( + fun fs -> + if g#is_dir ~followsymlinks:false fs then ( + visit g#ocaml_handle fs ( + fun dir filename { G.st_mode = mode } _ -> + match dir, filename, mode with + (* Ignore root directory and non-regular files. *) + | _, None, _ -> () + | _, Some _, mode when not (is_reg mode) -> () + | dir, Some filename, _ -> + (* Check the filename against all of the globs, and if it + * matches any then delete it. + *) + let matching glob = fnmatch glob filename [FNM_NOESCAPE] in + if List.exists matching globs then (

+ let path = full_path dir (Some filename) in + g#rm_f path + ) + ) + ) + ) fses + +let op = { + defaults with + name = "backup-files"; + enabled_by_default = true; + heading = s_"Remove editor backup files from the guest"; + pod_description = Some ( + sprintf (f_"\ +The following files are removed from anywhere in the guest +filesystem: + +%s + +On Linux and Unix operating systems, only the following filesystems +will be examined: + +%s") globs_as_pod unix_whitelist_as_pod); + perform_on_filesystems = Some backup_files_perform; +} + +let () = register_operation op diff --git a/sysprep/test-virt-sysprep-backup-files.sh b/sysprep/test-virt-sysprep-backup-files.sh new file mode 100755 index 0000000..bd9a36c --- /dev/null +++ b/sysprep/test-virt-sysprep-backup-files.sh @@ -0,0 +1,64 @@ [...] +guestfish -a test-backup-files.qcow2 -i <<'EOF'

+# Check the file list is the same as above. +guestfish -a test-backup-files.qcow2 -i find / > test-backup-files-after