From 226457de3d56d810ff08687e3b16996be5f223b0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Nov 2012 19:31:17 +0000 Subject: sysprep: Don't fail when trying to remove /var/spool/at/spool (directory). This fixes commit 1949016e899b2737525fdc9b6dda451ad9ecbd66. --- sysprep/sysprep_operation_cron_spool.ml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sysprep/sysprep_operation_cron_spool.ml b/sysprep/sysprep_operation_cron_spool.ml index e96832c9..c087887b 100644 --- a/sysprep/sysprep_operation_cron_spool.ml +++ b/sysprep/sysprep_operation_cron_spool.ml @@ -26,7 +26,9 @@ let cron_spool_perform g root = Array.iter g#rm (g#glob_expand "/var/spool/atjobs/*"); Array.iter g#rm (g#glob_expand "/var/spool/atjobs/.SEQ"); Array.iter g#rm (g#glob_expand "/var/spool/atspool/*"); - Array.iter g#rm (g#glob_expand "/var/spool/at/*"); + Array.iter + (fun path -> if not (g#is_dir path) then g#rm path) + (g#glob_expand "/var/spool/at/*"); Array.iter g#rm (g#glob_expand "/var/spool/at/.SEQ"); Array.iter g#rm (g#glob_expand "/var/spool/at/spool/*"); [] -- cgit