search for: ssh_userdir_perform

...e for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +open Sysprep_operation + +module G = Guestfs + +let ssh_userdir_perform g root = + let typ = g#inspect_get_type root in + if typ <> "windows" then ( + let dirs = g#glob_expand "/home/*/.ssh" in + Array.iter ( + fun dir -> g#rm_rf dir; + ) dirs; + g#rm_rf "/root/.ssh"; + [] + ) + else [] + +let ssh_userdir_o...

...on_ssh_userdir.ml b/sysprep/sysprep_operation_ssh_userdir.ml > index 19f8890..2ff9581 100644 > --- a/sysprep/sysprep_operation_ssh_userdir.ml > +++ b/sysprep/sysprep_operation_ssh_userdir.ml > @@ -21,7 +21,7 @@ open Common_gettext.Gettext > > module G = Guestfs > > -let ssh_userdir_perform g root side_effects = > +let ssh_userdir_perform (g : Guestfs.guestfs) root side_effects = > let typ = g#inspect_get_type root in > if typ <> "windows" then ( > let dirs = g#glob_expand "/home/*/.ssh" in > diff --git a/sysprep/sysprep_operation_ss...

...in diff --git a/sysprep/sysprep_operation_ssh_userdir.ml b/sysprep/sysprep_operation_ssh_userdir.ml index 19f8890..2ff9581 100644 --- a/sysprep/sysprep_operation_ssh_userdir.ml +++ b/sysprep/sysprep_operation_ssh_userdir.ml @@ -21,7 +21,7 @@ open Common_gettext.Gettext module G = Guestfs -let ssh_userdir_perform g root side_effects = +let ssh_userdir_perform (g : Guestfs.guestfs) root side_effects = let typ = g#inspect_get_type root in if typ <> "windows" then ( let dirs = g#glob_expand "/home/*/.ssh" in diff --git a/sysprep/sysprep_operation_sssd_db_log.ml b/sysprep/sy...

--- sysprep/sysprep_operation.mli | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sysprep/sysprep_operation.mli b/sysprep/sysprep_operation.mli index 61dde72..eb89db4 100644 --- a/sysprep/sysprep_operation.mli +++ b/sysprep/sysprep_operation.mli @@ -16,14 +16,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *) -(** Structure used to describe sysprep

In the kernel and qemu communities it is routine for patches that will be backported to stable branches to be posted for review. I'm proposing we do the same for libguestfs stable branches. All of the attached have been tested with 'make check-release'. Rich.

...in diff --git a/sysprep/sysprep_operation_ssh_userdir.ml b/sysprep/sysprep_operation_ssh_userdir.ml index 60cf778..bec1d56 100644 --- a/sysprep/sysprep_operation_ssh_userdir.ml +++ b/sysprep/sysprep_operation_ssh_userdir.ml @@ -21,7 +21,7 @@ open Common_gettext.Gettext module G = Guestfs -let ssh_userdir_perform ~verbose ~quiet g root side_effects = +let ssh_userdir_perform ~quiet g root side_effects = let typ = g#inspect_get_type root in if typ <> "windows" then ( let dirs = g#glob_expand "/home/*/.ssh" in diff --git a/sysprep/sysprep_operation_sssd_db_log.ml b/sysprep...

Version 1 of the patch, for discussion, but not to be applied. It does work, but needs a lot more testing. This removes all the psychopathic gettextify cruft, and replaces it with a 99 line Makefile.am. A large win, I think. The third patch implements gettext support in the OCaml tools. The fourth patch is just for illustration. It shows the consequent changes to libguestfs.pot and the po

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.

https://bugzilla.redhat.com/show_bug.cgi?id=1167623