Rename the modules subpkg to targets, to better reflect what it contains.

diff --git a/catalyst/main.py b/catalyst/main.py
index 8acd2804f9dd57952d0895044c12fbc2df053f4d..cb30bd7783ff32600b77d76ce8f11983a3ec5000 100644 (file)
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -200,11 +200,11 @@ def import_modules():
        targetmap={}
 
        try:
-               module_dir = __selfpath__ + "/modules/"
+               module_dir = __selfpath__ + "/targets/"
                for x in required_build_targets:
                        try:
                                fh=open(module_dir + x + ".py")
-                               module=imp.load_module(x, fh,"modules/" + x + ".py",
+                               module=imp.load_module(x, fh,"targets/" + x + ".py",
                                        (".py", "r", imp.PY_SOURCE))
                                fh.close()
 
@@ -214,7 +214,7 @@ def import_modules():
                for x in valid_build_targets:
                        try:
                                fh=open(module_dir + x + ".py")
-                               module=imp.load_module(x, fh, "modules/" + x + ".py",
+                               module=imp.load_module(x, fh, "targets/" + x + ".py",
                                        (".py", "r", imp.PY_SOURCE))
                                module.register(targetmap)
                                fh.close()

diff --git a/catalyst/modules/__init__.py b/catalyst/targets/__init__.py
similarity index 100%
rename from catalyst/modules/__init__.py
rename to catalyst/targets/__init__.py

diff --git a/catalyst/modules/embedded_target.py b/catalyst/targets/embedded_target.py
similarity index 100%
rename from catalyst/modules/embedded_target.py
rename to catalyst/targets/embedded_target.py

diff --git a/catalyst/modules/generic_stage_target.py b/catalyst/targets/generic_stage_target.py
similarity index 100%
rename from catalyst/modules/generic_stage_target.py
rename to catalyst/targets/generic_stage_target.py

diff --git a/catalyst/modules/generic_target.py b/catalyst/targets/generic_target.py
similarity index 100%
rename from catalyst/modules/generic_target.py
rename to catalyst/targets/generic_target.py

diff --git a/catalyst/modules/grp_target.py b/catalyst/targets/grp_target.py
similarity index 100%
rename from catalyst/modules/grp_target.py
rename to catalyst/targets/grp_target.py

diff --git a/catalyst/modules/livecd_stage1_target.py b/catalyst/targets/livecd_stage1_target.py
similarity index 100%
rename from catalyst/modules/livecd_stage1_target.py
rename to catalyst/targets/livecd_stage1_target.py

diff --git a/catalyst/modules/livecd_stage2_target.py b/catalyst/targets/livecd_stage2_target.py
similarity index 100%
rename from catalyst/modules/livecd_stage2_target.py
rename to catalyst/targets/livecd_stage2_target.py

diff --git a/catalyst/modules/netboot2_target.py b/catalyst/targets/netboot2_target.py
similarity index 100%
rename from catalyst/modules/netboot2_target.py
rename to catalyst/targets/netboot2_target.py

diff --git a/catalyst/modules/netboot_target.py b/catalyst/targets/netboot_target.py
similarity index 100%
rename from catalyst/modules/netboot_target.py
rename to catalyst/targets/netboot_target.py

diff --git a/catalyst/modules/snapshot_target.py b/catalyst/targets/snapshot_target.py
similarity index 100%
rename from catalyst/modules/snapshot_target.py
rename to catalyst/targets/snapshot_target.py

diff --git a/catalyst/modules/stage1_target.py b/catalyst/targets/stage1_target.py
similarity index 100%
rename from catalyst/modules/stage1_target.py
rename to catalyst/targets/stage1_target.py

diff --git a/catalyst/modules/stage2_target.py b/catalyst/targets/stage2_target.py
similarity index 100%
rename from catalyst/modules/stage2_target.py
rename to catalyst/targets/stage2_target.py

diff --git a/catalyst/modules/stage3_target.py b/catalyst/targets/stage3_target.py
similarity index 100%
rename from catalyst/modules/stage3_target.py
rename to catalyst/targets/stage3_target.py

diff --git a/catalyst/modules/stage4_target.py b/catalyst/targets/stage4_target.py
similarity index 100%
rename from catalyst/modules/stage4_target.py
rename to catalyst/targets/stage4_target.py

diff --git a/catalyst/modules/tinderbox_target.py b/catalyst/targets/tinderbox_target.py
similarity index 100%
rename from catalyst/modules/tinderbox_target.py
rename to catalyst/targets/tinderbox_target.py