diff --git a/image_creator/os_type/__init__.py b/image_creator/os_type/__init__.py
index 17ca22edb5ad14fe57738dde08b5812b2e1222e1..03ca4a7d3520d5a4676082a41feb45ac779db0e8 100644
--- a/image_creator/os_type/__init__.py
+++ b/image_creator/os_type/__init__.py
@@ -42,6 +42,9 @@ def add_prefix(target):
return map(lambda x: prefix + x, target(self, *args))
return wrapper
+def exclude_task(func):
+ func.excluded = True
+ return func
class OSBase(object):
"""Basic operating system class"""
@@ -116,9 +119,7 @@ class OSBase(object):
output('Cleaning up sensitive data out of the OS image:')
- is_cleanup = lambda x: x.startswith('data_cleanup_') and \
- callable(getattr(self, x))
- tasks = [getattr(self, x) for x in dir(self) if is_cleanup(x)]
+ tasks, _ = self.list_data_cleanup()
size = len(tasks)
cnt = 0
for task in tasks:
@@ -132,9 +133,7 @@ class OSBase(object):
output('Preparing system for image creation:')
- is_sysprep = lambda x: x.startswith('sysprep_') and \
- callable(getattr(self, x))
- tasks = [getattr(self, x) for x in dir(self) if is_sysprep(x)]
+ tasks, _ = self.list_sysprep()
size = len(tasks)
cnt = 0
for task in tasks:
@@ -143,4 +142,28 @@ class OSBase(object):
task()
output()
+ def list_sysprep(self):
+ """List all sysprep actions"""
+
+ is_sysprep = lambda x: x.startswith('sysprep_') and \
+ callable(getattr(self, x))
+ tasks = [getattr(self, x) for x in dir(self) if is_sysprep(x)]
+
+ included = [t for t in tasks if not getattr(t, "excluded", False)]
+ excluded = [t for t in tasks if getattr(t, "excluded", False)]
+
+ return included, excluded
+
+ def list_data_cleanup(self):
+ """List all data_cleanup actions"""
+
+ is_cleanup = lambda x: x.startswith('data_cleanup_') and \
+ callable(getattr(self, x))
+ tasks = [getattr(self, x) for x in dir(self) if is_cleanup(x)]
+
+ included = [t for t in tasks if not getattr(t, "excluded", False)]
+ excluded = [t for t in tasks if getattr(t, "excluded", False)]
+
+ return included, excluded
+
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai :
diff --git a/image_creator/os_type/freebsd.py b/image_creator/os_type/freebsd.py
index 33ba8870df99091d454ecf1bd6cfa419580ccd36..c2e1a5ca867910ef41ed306ee5f6b5b2e38172d6 100644
--- a/image_creator/os_type/freebsd.py
+++ b/image_creator/os_type/freebsd.py
@@ -31,7 +31,7 @@
# interpreted as representing official policies, either expressed
# or implied, of GRNET S.A.
-from image_creator.os_type.unix import Unix
+from image_creator.os_type.unix import Unix, exclude_task
class Freebsd(Unix):
diff --git a/image_creator/os_type/hurd.py b/image_creator/os_type/hurd.py
index 25264abf582b093a1d70f002e4d2c99a57cb9979..bba3e65cbf66b6ab2f8f4527862c9bccb8cb57ea 100644
--- a/image_creator/os_type/hurd.py
+++ b/image_creator/os_type/hurd.py
@@ -31,7 +31,7 @@
# interpreted as representing official policies, either expressed
# or implied, of GRNET S.A.
-from image_creator.os_type.unix import Unix
+from image_creator.os_type.unix import Unix, exclude_task
class Hard(Unix):
diff --git a/image_creator/os_type/linux.py b/image_creator/os_type/linux.py
index 7a6fab1f669f4bfbcdaf0608524745eee2c1804c..31e651dfe5bf0ae9f215abe2a32b834874aea1f8 100644
--- a/image_creator/os_type/linux.py
+++ b/image_creator/os_type/linux.py
@@ -31,7 +31,7 @@
# interpreted as representing official policies, either expressed
# or implied, of GRNET S.A.
-from image_creator.os_type.unix import Unix
+from image_creator.os_type.unix import Unix, exclude_task
from image_creator.util import warn, output
import re
@@ -56,7 +56,7 @@ class Linux(Unix):
self._uuid[dev] = attr[1]
return attr[1]
- def sysprep_acpid(self, print_header=True):
+ def sysprep_fix_acpid(self, print_header=True):
"""Replace acpid powerdown action scripts to immediately shutdown the
system without checking if a GUI is running.
"""
diff --git a/image_creator/os_type/netbsd.py b/image_creator/os_type/netbsd.py
index bfb94d6b92da748711f2675a69e234021073b3dc..9973b28fe879aeb0796d050b5fa130ca20c2ba4a 100644
--- a/image_creator/os_type/netbsd.py
+++ b/image_creator/os_type/netbsd.py
@@ -31,7 +31,7 @@
# interpreted as representing official policies, either expressed
# or implied, of GRNET S.A.
-from image_creator.os_type.unix import Unix
+from image_creator.os_type.unix import Unix, exclude_task
class Netbsd(Unix):
diff --git a/image_creator/os_type/slackware.py b/image_creator/os_type/slackware.py
index d4f4c440545726782a11a325032feb67988363e4..ac7ded02c765c6287ac2dfbd92843d21b9d31310 100644
--- a/image_creator/os_type/slackware.py
+++ b/image_creator/os_type/slackware.py
@@ -31,7 +31,7 @@
# interpreted as representing official policies, either expressed
# or implied, of GRNET S.A.
-from image_creator.os_type.linux import Linux
+from image_creator.os_type.linux import Linux, exclude_task
class Slackware(Linux):
diff --git a/image_creator/os_type/ubuntu.py b/image_creator/os_type/ubuntu.py
index 77d80ff08c83b0c707fa28adaa266f6aff852fbe..4dec1e8953ff46c2efaab0a6e4dfc2346441a6df 100644
--- a/image_creator/os_type/ubuntu.py
+++ b/image_creator/os_type/ubuntu.py
@@ -31,7 +31,7 @@
# interpreted as representing official policies, either expressed
# or implied, of GRNET S.A.
-from image_creator.os_type.linux import Linux
+from image_creator.os_type.linux import Linux, exclude_task
class Ubuntu(Linux):
diff --git a/image_creator/os_type/unix.py b/image_creator/os_type/unix.py
index 75c479707b9e79286fd7c235050f369cbab9cfdb..b5d0ba73d1b53b1aa3b697be99344afb6c4bc040 100644
--- a/image_creator/os_type/unix.py
+++ b/image_creator/os_type/unix.py
@@ -34,7 +34,7 @@
import re
import sys
-from image_creator.os_type import OSBase
+from image_creator.os_type import OSBase, exclude_task
from image_creator.util import warn, output
@@ -95,6 +95,7 @@ class Unix(OSBase):
self.foreach_file('/var/log', self.g.truncate, ftype='r')
+ @exclude_task
def data_cleanup_mail(self, print_header=True):
"""Remove all files under /var/mail and /var/spool/mail"""
diff --git a/image_creator/os_type/windows.py b/image_creator/os_type/windows.py
index 7ba67672a7a6bf118d37e65b05814b165a5b79d4..036e33b9d6c9bc71466a30dd52eb35bfa489612e 100644
--- a/image_creator/os_type/windows.py
+++ b/image_creator/os_type/windows.py
@@ -31,7 +31,7 @@
# interpreted as representing official policies, either expressed
# or implied, of GRNET S.A.
-from image_creator.os_type import OSBase
+from image_creator.os_type import OSBase, exclude_task
class Windows(OSBase):