X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/5f7e1e0c312dd626cc0d4a0f78c86d440948f229..fba0968870e13efbe1926fa43363aa56efd79ee4:/image_creator/os_type/unix.py diff --git a/image_creator/os_type/unix.py b/image_creator/os_type/unix.py index fa70805..2cd8452 100644 --- a/image_creator/os_type/unix.py +++ b/image_creator/os_type/unix.py @@ -43,8 +43,8 @@ class Unix(OSBase): '.bash_history', '.gnupg', '.ssh', - '.mozilla', - '.thunderbird' + '.kamakirc', + '.kamaki.history' ] def __init__(self, rootdev, ghandler, output): @@ -56,7 +56,6 @@ class Unix(OSBase): self.out.warn("No passworded users found!") del self.meta['USERS'] - def _get_passworded_users(self): users = [] regexp = re.compile('(\S+):((?:!\S+)|(?:[^!*]\S+)|):(?:\S*:){6}') @@ -203,5 +202,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 :