Author: jsuchome
Date: Fri Jul 25 10:14:04 2008
New Revision: 49408
URL: http://svn.opensuse.org/viewcvs/yast?rev=49408&view=rev
Log:
read the default information for new type from the template
Modified:
trunk/product-creator/package/yast2-product-creator.changes
trunk/product-creator/src/kiwi_dialogs.ycp
Modified: trunk/product-creator/package/yast2-product-creator.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-product-creator.changes?rev=49408&r1=49407&r2=49408&view=diff
==============================================================================
--- trunk/product-creator/package/yast2-product-creator.changes (original)
+++ trunk/product-creator/package/yast2-product-creator.changes Fri Jul 25 10:14:04 2008
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Fri Jul 25 10:11:23 CEST 2008 - jsuchome@suse.cz
+
+- read the default information for new type from the template
+
+-------------------------------------------------------------------
Thu Jul 24 10:55:06 CEST 2008 - jsuchome@suse.cz
- adapted to last version of ag_anyxml (bnc#409491)
Modified: trunk/product-creator/src/kiwi_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=49408&r1=49407&r2=49408&view=diff
==============================================================================
--- trunk/product-creator/src/kiwi_dialogs.ycp (original)
+++ trunk/product-creator/src/kiwi_dialogs.ycp Fri Jul 25 10:14:04 2008
@@ -1134,18 +1134,25 @@
return typemap;
});
// add the new type, that was not previously defined in config.xml
- // FIXME the default values (format,filesystem...) are missing
+ // read the default values for this type from the template
if (!primary_included)
{
- string prefix = kiwi_task == "pxe" ? "net" : kiwi_task;
- boot_dir = substring (boot_dir, search (boot_dir, "/") + 1);
- KiwiConfig["preferences",0,"type"] = add (
- KiwiConfig["preferences",0,"type"]:[], $[
- content_key : kiwi_task,
- "boot" : prefix + "boot/" + boot_dir,
- "primary" : "true"
- ]
- );
+ if (default_dir == "")
+ {
+ default_dir =
+ Directory::datadir+"/product-creator/kiwi_templates/";
+ default_dir = default_dir + (kiwi_task== "xen" ? "xen" : "iso");
+ }
+ map