Remove the .ssh directory of user "root" and any other users who have a .ssh directory in their home directorys. Signed-off-by: Wanlong Gao <gaowanlong(a)cn.fujitsu.com&gt; --- TODO | 1 - sysprep/Makefile.am | 2 ++ sysprep/sysprep_operation_ssh_userdir.ml | 46 ++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 sysprep/sysprep_operation_ssh_userdir.ml diff --git a/TODO b/TODO index 3d5613c..bf96ab0 100644 --- a/TODO +++ b/TODO @@ -543,7 +543,6 @@ virt-sysprep ideas . run external guestfish script virt-sysprep --fish=/tmp/foo.fish . rm /var/cache/apt/archives/* - /var/run/* and pam_faillock's data files - - homedirs/.ssh directory, especially /root/.ssh (Steve Grubb) - if drives are encrypted, then dm-crypt key should be changed and drives all re-encrypted - /etc/pki diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index 3a48702..f51fc07 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -46,6 +46,7 @@ SOURCES = \ sysprep_operation_script.ml \ sysprep_operation_smolt_uuid.ml \ sysprep_operation_ssh_hostkeys.ml \ + sysprep_operation_ssh_userdir.ml \ sysprep_operation_udev_persistent_net.ml \ sysprep_operation_utmp.ml \ sysprep_operation_yum_uuid.ml \ @@ -70,6 +71,7 @@ OBJECTS = \ sysprep_operation_script.cmx \ sysprep_operation_smolt_uuid.cmx \ sysprep_operation_ssh_hostkeys.cmx \ + sysprep_operation_ssh_userdir.cmx \ sysprep_operation_udev_persistent_net.cmx \ sysprep_operation_utmp.cmx \ sysprep_operation_yum_uuid.cmx \ diff --git a/sysprep/sysprep_operation_ssh_userdir.ml b/sysprep/sysprep_operation_ssh_userdir.ml new file mode 100644 index 0000000..5b59416 --- /dev/null +++ b/sysprep/sysprep_operation_ssh_userdir.ml @@ -0,0 +1,46 @@ +(* virt-sysprep + * Copyright (C) 2012 FUJITSU LIMITED + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License 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_op = { + name = "ssh-userdir"; + pod_description = "\ +Remove the C<.ssh> directory in the guest. + +Remove the C<.ssh> directory of user \"root\" and any other +users who have a C<.ssh> directory in their home directorys."; + extra_args = []; + perform = ssh_userdir_perform; +} + +let () = register_operation ssh_userdir_op -- 1.7.10