projects
/
snf-image-creator
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add new bundle_volume module
[snf-image-creator]
/
image_creator
/
os_type
/
unix.py
diff --git
a/image_creator/os_type/unix.py
b/image_creator/os_type/unix.py
index
fa70805
..
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',
sensitive_userdata = [
'.bash_history',
'.gnupg',
- '.ssh',
- '.mozilla',
- '.thunderbird'
+ '.ssh'
]
def __init__(self, rootdev, ghandler, output):
]
def __init__(self, rootdev, ghandler, output):
@@
-56,7
+54,6
@@
class Unix(OSBase):
self.out.warn("No passworded users found!")
del self.meta['USERS']
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}')
def _get_passworded_users(self):
users = []
regexp = re.compile('(\S+):((?:!\S+)|(?:[^!*]\S+)|):(?:\S*:){6}')
@@
-203,5
+200,7
@@
class Unix(OSBase):
fname = "%s/%s" % (homedir, data)
if self.g.is_file(fname):
self.g.scrub_file(fname)
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 :
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai :