projects
/
snf-image-creator
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
12da78d
)
Fix cleanup_userdata sysprep
author
Nikos Skalkotos
<skalkoto@grnet.gr>
Wed, 29 Aug 2012 08:54:26 +0000
(11:54 +0300)
committer
Nikos Skalkotos
<skalkoto@grnet.gr>
Wed, 29 Aug 2012 08:54:26 +0000
(11:54 +0300)
The function used to ignore directories when cleaning sensitive data
image_creator/os_type/unix.py
patch
|
blob
|
history
diff --git
a/image_creator/os_type/unix.py
b/image_creator/os_type/unix.py
index
1e74668
..
e0f0622
100644
(file)
--- 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 :