similar to: [PATCH] sysprep: handle at jobs in cron-spool operation

When cleaning the directories with cron/at jobs, remove only files there, as subdirectories might be used by other systems; for example in Debian under /var/spool/cron/ there is the atjobs subdirectory with the actual at queue. Make sure to not remove .SEQ files anymore, as they represent the at job counter which is needed by the at daemon. Instead, reset these files to 0. Furthermore, add also

When cleaning the directories with cron/at jobs, remove only files there, as subdirectories might be used by other systems; for example in Debian under /var/spool/cron/ there is the atjobs subdirectory with the actual at queue. Make sure to not remove .SEQ files anymore, as they represent the at job counter which is needed by the at daemon. Instead, reset these files to 0. Furthermore, add also

Collect this small snippet to get the part of a string after the last occurrency of a character; replace with it the current snippets doing the same. Should be just code motion. --- customize/password.ml | 5 +++-- mllib/common_utils.ml | 7 +++++++ mllib/common_utils.mli | 3 +++ sysprep/sysprep_operation_user_account.ml | 5 +++--

This way it is possible to use rm_rf_only_files, but not removing specific files. --- mllib/common_utils.ml | 8 +++++++- mllib/common_utils.mli | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml index 516cff3..3737b4c 100644 --- a/mllib/common_utils.ml +++ b/mllib/common_utils.ml @@ -640,13 +640,19 @@ let rmdir_on_exit = *

Hi Rich, I tried to implement the logging feature, but I can't though compiling with this patch now, could you please give me some comments? The error message is below, --- ocamlfind ocamlopt -g -warn-error CDEFLMPSUVYZX -package unix -I ../src/.libs -I ../ocaml -c sysprep_operation.ml -o sysprep_operation.cmx File "sysprep_operation.ml", line 1, characters 0-1: Error: The

sysprep/sysprep_operation_cron_spool.ml claims to remove at jobs, but those are not stored in /var/spool/cron/ on my system. Is the description wrong, or do other distros store the spool data in the cron dir? For me it looks like this (000110156d537 is currently executed): root at probook:~ # find /var/spool/at* -ls 67540 1 drwx------ 2 at at 1024 Sep 19 18:55

Hi Rich, What I felt at using virt-sysprep is that all things are done in silent and there is no log what's done. Please consider to add logging feature what was done at virt-sysprep. For example, deleted /var/log/utmp deleted /etc/..... modified /etc/sysconfing/network... ... What do you think? Thanks, Wanlong Gao Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> ---

--- 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

Remove the ca certificates. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- sysprep/Makefile.am | 2 + sysprep/sysprep_operation_ca_certificates.ml | 62 ++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 sysprep/sysprep_operation_ca_certificates.ml diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index

Here is a preliminary fix for this bug. I'm running the test suite on this now. Rich.

Remove the bash history of users in home directory, and history of root. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- sysprep/Makefile.am | 2 ++ sysprep/sysprep_operation_bash_history.ml | 44 +++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 sysprep/sysprep_operation_bash_history.ml diff --git

Help the OCaml compiler by expliciting Guestfs.guestfs as type for 'g' in some functions. --- get-kernel/get_kernel.ml | 2 +- sysprep/sysprep_operation_abrt_data.ml | 2 +- sysprep/sysprep_operation_bash_history.ml | 2 +- sysprep/sysprep_operation_ca_certificates.ml | 2 +- sysprep/sysprep_operation_crash_data.ml

Remove the db and log of sssd. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- sysprep/Makefile.am | 2 ++ sysprep/sysprep_operation_sssd_db_log.ml | 50 ++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 sysprep/sysprep_operation_sssd_db_log.ml diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index

Add a new optional bool "directoryslash" to indicate whether the caller wants trailing slashes in names of directories, defaulting to true (the current behaviour); this helps with interoperability with other tools (such as rm). Related to RHBZ#1293271. --- daemon/glob.c | 11 +++++++++-- generator/actions.ml | 21 ++++++++++++++++----- gobject/Makefile.inc | 2 ++ po/POTFILES

Remove the logfiles configured by /etc/logrotate.d/*. Omit the logfile of "samba" and "sssd" which we removed them separately . Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- sysprep/sysprep_operation_logfiles.ml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sysprep/sysprep_operation_logfiles.ml

Don't pass these flags to dozens of functions. --- builder/builder.ml | 47 +++++++++-------- builder/cache.ml | 4 +- builder/cache.mli | 2 +- builder/cmdline.ml | 13 ++--- builder/downloader.ml | 14 +++-- builder/downloader.mli

Flag the system for reconfiguration by touching /.unconfigured . Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- TODO | 2 - sysprep/Makefile.am | 2 + sysprep/sysprep_operation_flag_reconfiguration.ml | 42 +++++++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) create mode

Iterate on the array directly, instead of converting it to a list to do the same; also, avoid a temporary variable for it. --- v2v/convert_linux.ml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index f9aa334..9941750 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -85,9 +85,7 @@ let rec convert

Remove the cache of package manager like yum and apt. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- sysprep/Makefile.am | 2 + sysprep/sysprep_operation_package_manager_cache.ml | 49 ++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 sysprep/sysprep_operation_package_manager_cache.ml diff --git

Hello all, Just a quick note to other Solaris users that upgrading to samba-3.0.5 seems to cause cron to core dump into /var/spool/cron/atjobs. After investigating this for a few days, it appears to be due to the winbind entry in /etc/nsswith.conf. Of course, once I restart the cron daemon, and it picks up the new libnss_winbind and pam_winbind.so files, everything is fine. However, this has left