Refine the outdir for release

Signed-off-by: Gui Chen <gui.chen@intel.com>

diff --git a/plugins/imager/fs_plugin.py b/plugins/imager/fs_plugin.py
index 45f9960..987220b 100644 (file)
--- a/plugins/imager/fs_plugin.py
+++ b/plugins/imager/fs_plugin.py
@@ -55,7 +55,7 @@ class FsPlugin(ImagerPlugin):
                 recording_pkgs.append('name')
             ksconf = misc.save_ksconf_file(ksconf, createopts['release'])
             name = os.path.splitext(os.path.basename(ksconf))[0]
-            createopts['outdir'] = "%s/%s-%s/" % (createopts['outdir'], name, createopts['release'])
+            createopts['outdir'] = "%s/%s/images/%s/" % (createopts['outdir'], createopts['release'], name)
         cfgmgr._ksconf = ksconf
 
         # try to find the pkgmgr

diff --git a/plugins/imager/livecd_plugin.py b/plugins/imager/livecd_plugin.py
index 5e8682e..f702d1b 100644 (file)
--- a/plugins/imager/livecd_plugin.py
+++ b/plugins/imager/livecd_plugin.py
@@ -60,7 +60,7 @@ class LiveCDPlugin(ImagerPlugin):
                 recording_pkgs.append('name')
             ksconf = misc.save_ksconf_file(ksconf, creatoropts['release'])
             name = os.path.splitext(os.path.basename(ksconf))[0]
-            creatoropts['outdir'] = "%s/%s-%s/" % (creatoropts['outdir'], name, creatoropts['release'])
+            createopts['outdir'] = "%s/%s/images/%s/" % (createopts['outdir'], createopts['release'], name)
         cfgmgr._ksconf = ksconf
 
         # try to find the pkgmgr

diff --git a/plugins/imager/liveusb_plugin.py b/plugins/imager/liveusb_plugin.py
index 02ad769..c620fa8 100644 (file)
--- a/plugins/imager/liveusb_plugin.py
+++ b/plugins/imager/liveusb_plugin.py
@@ -62,7 +62,7 @@ class LiveUSBPlugin(ImagerPlugin):
                 recording_pkgs.append('name')
             ksconf = misc.save_ksconf_file(ksconf, creatoropts['release'])
             name = os.path.splitext(os.path.basename(ksconf))[0]
-            creatoropts['outdir'] = "%s/%s-%s/" % (creatoropts['outdir'], name, creatoropts['release'])
+            createopts['outdir'] = "%s/%s/images/%s/" % (createopts['outdir'], createopts['release'], name)
         cfgmgr._ksconf = ksconf
 
         # try to find the pkgmgr

diff --git a/plugins/imager/loop_plugin.py b/plugins/imager/loop_plugin.py
index 991f439..fbc90bf 100644 (file)
--- a/plugins/imager/loop_plugin.py
+++ b/plugins/imager/loop_plugin.py
@@ -57,7 +57,7 @@ class LoopPlugin(ImagerPlugin):
                 recording_pkgs.append('name')
             ksconf = misc.save_ksconf_file(ksconf, creatoropts['release'])
             name = os.path.splitext(os.path.basename(ksconf))[0]
-            creatoropts['outdir'] = "%s/%s-%s/" % (creatoropts['outdir'], name, creatoropts['release'])
+            createopts['outdir'] = "%s/%s/images/%s/" % (createopts['outdir'], createopts['release'], name)
         cfgmgr._ksconf = ksconf
 
         # try to find the pkgmgr

diff --git a/plugins/imager/raw_plugin.py b/plugins/imager/raw_plugin.py
index 5ae1a9a..d543b14 100644 (file)
--- a/plugins/imager/raw_plugin.py
+++ b/plugins/imager/raw_plugin.py
@@ -59,7 +59,7 @@ class RawPlugin(ImagerPlugin):
                 recording_pkgs.append('name')
             ksconf = misc.save_ksconf_file(ksconf, creatoropts['release'])
             name = os.path.splitext(os.path.basename(ksconf))[0]
-            creatoropts['outdir'] = "%s/%s-%s/" % (creatoropts['outdir'], name, creatoropts['release'])
+            createopts['outdir'] = "%s/%s/images/%s/" % (createopts['outdir'], createopts['release'], name)
         cfgmgr._ksconf = ksconf
 
         # try to find the pkgmgr