Revision 3f70f242 image_creator/os_type/unix.py

b/image_creator/os_type/unix.py
71 71

  
72 72
        return users
73 73

  
74
    def data_cleanup_cache(self):
74
    def data_cleanup_cache(self, print_header=True):
75 75
        """Remove all regular files under /var/cache"""
76 76

  
77
        puts('* Removing files under /var/cache')
77
        if print_header:
78
            puts('Removing files under /var/cache')
78 79

  
79 80
        self.foreach_file('/var/cache', self.g.rm, ftype='r')
80 81

  
81
    def data_cleanup_tmp(self):
82
    def data_cleanup_tmp(self, print_header=True):
82 83
        """Remove all files under /tmp and /var/tmp"""
83 84

  
84
        puts('* Removing files under /tmp and /var/tmp')
85
        if print_header:
86
            puts('Removing files under /tmp and /var/tmp')
85 87

  
86 88
        self.foreach_file('/tmp', self.g.rm_rf, maxdepth=1)
87 89
        self.foreach_file('/var/tmp', self.g.rm_rf, maxdepth=1)
88 90

  
89
    def data_cleanup_log(self):
91
    def data_cleanup_log(self, print_header=True):
90 92
        """Empty all files under /var/log"""
91 93

  
92
        puts('* Emptying all files under /var/log')
94
        if print_header:
95
            puts('Emptying all files under /var/log')
93 96

  
94 97
        self.foreach_file('/var/log', self.g.truncate, ftype='r')
95 98

  
96
    def data_cleanup_mail(self):
99
    def data_cleanup_mail(self, print_header=True):
97 100
        """Remove all files under /var/mail and /var/spool/mail"""
98 101

  
99
        puts('* Removing files under /var/mail and /var/spool/mail')
102
        if print_header:
103
            puts('Removing files under /var/mail and /var/spool/mail')
100 104

  
101 105
        self.foreach_file('/var/spool/mail', self.g.rm_rf, maxdepth=1)
102 106
        self.foreach_file('/var/mail', self.g.rm_rf, maxdepth=1)
103 107

  
104
    def data_cleanup_userdata(self):
108
    def data_cleanup_userdata(self, print_header=True):
105 109
        """Delete sensitive userdata"""
106 110

  
107 111
        homedirs = ['/root'] + self.ls('/home/')
108 112

  
113
        if print_header:
114
            puts('Removing sensitive user data under %s' % " ".join(homedirs))
115

  
109 116
        for homedir in homedirs:
110
            puts('* Removing sensitive user data under %s' % homedir)
111 117
            for data in self.sensitive_userdata:
112 118
                fname = "%s/%s" % (homedir, data)
113 119
                if self.g.is_file(fname):

Also available in: Unified diff