From e1e7b8436dd1cb39285e2ef378b619358d1c62e8 Mon Sep 17 00:00:00 2001 From: Nikos Skalkotos Date: Wed, 29 Aug 2012 11:54:26 +0300 Subject: [PATCH] Fix cleanup_userdata sysprep The function used to ignore directories when cleaning sensitive data --- image_creator/os_type/unix.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/image_creator/os_type/unix.py b/image_creator/os_type/unix.py index 1e74668..e0f0622 100644 --- a/image_creator/os_type/unix.py +++ b/image_creator/os_type/unix.py @@ -42,9 +42,7 @@ class Unix(OSBase): sensitive_userdata = [ '.bash_history', '.gnupg', - '.ssh', - '.mozilla', - '.thunderbird' + '.ssh' ] def __init__(self, rootdev, ghandler, output): @@ -202,5 +200,7 @@ class Unix(OSBase): fname = "%s/%s" % (homedir, data) if self.g.is_file(fname): self.g.scrub_file(fname) + elif self.g.is_dir(fname): + self.foreach_file(fname, self.g.scrub_file, ftype='r') # vim: set sta sts=4 shiftwidth=4 sw=4 et ai : -- 1.7.10.4