Author: jsuchome Date: Fri Sep 21 14:52:14 2007 New Revision: 41019 URL: http://svn.opensuse.org/viewcvs/yast?rev=41019&view=rev Log: - support for kiwi images templates (F302371) - support project control for images (F302370) - use zypper instead of smart - write schemeversion to config.xml - directories with templates are specified in sysconfig/product-creator - enable modifications of configurations without creating images - do not import already imported and modified configuration - enable support for unlisted boot images (e.g. netboot) - show the maximum available space - use lazy initialization of installation sources - tell zypper to ignore zypp lock (#310581) - remove 'prepare' directory before calling kiwi (#325664) - use defaultroot value from config.xml for 'prepare' directory (F302371) - 2.13.12 Added: branches/SuSE-SLE-10-SP1-Branch/product-creator/agents/cfg_product-creator.scr branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/sysconfig.product-creator branches/SuSE-SLE-10-SP1-Branch/product-creator/src/image-creator.desktop branches/SuSE-SLE-10-SP1-Branch/product-creator/src/image-creator.ycp (with props) branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (with props) Removed: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/agent-kiwi/ag_kiwi branches/SuSE-SLE-10-SP1-Branch/product-creator/agents/Makefile.am branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Makefile.am branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/Makefile.am branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/kiwi_templates/iso/config.xml branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/kiwi_templates/xen/config.xml branches/SuSE-SLE-10-SP1-Branch/product-creator/src/dialogs.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/yast2-product-creator.spec.in Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION?rev=41019&r1=41018&r2=41019&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Fri Sep 21 14:52:14 2007 @@ -1 +1 @@ -2.13.11 +2.13.12 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/agent-kiwi/ag_kiwi URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/agent-kiwi/ag_kiwi?rev=41019&r1=41018&r2=41019&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/agent-kiwi/ag_kiwi (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/agent-kiwi/ag_kiwi Fri Sep 21 14:52:14 2007 @@ -29,7 +29,7 @@ my $optionsNodeList = $systemTree -> getElementsByTagName ("preferences"); my $usrdataNodeList = $systemTree -> getElementsByTagName ("users"); my $packageNodeList = $systemTree -> getElementsByTagName ("packages"); - my $imgnameNodeList = $systemTree -> getElementsByTagName ("image"); +# my $imgnameNodeList = $systemTree -> getElementsByTagName ("image"); my $key = "packages"; $retmap{$key} = {}; @@ -38,6 +38,8 @@ my $type = $node -> getAttribute ("type"); y2milestone ("package list type: $type"); $retmap{$key}{$type} = {}; + my $patterntype = $node -> getAttribute ("patternType"); + $retmap{$key}{$type}{"patternType"} = $patterntype if $patterntype; foreach my $tag ("package", "opensusePattern", "ignore") { my @sw_list = (); foreach my $element ($node -> getElementsByTagName ($tag)) { @@ -57,10 +59,10 @@ } } my $prefs = $optionsNodeList -> get_node(1); - foreach my $tag ("packagemanager", "version", "rpm-check-signatures", "rpm-force", - "size") { + foreach my $tag ("packagemanager", "version", "rpm-check-signatures", + "rpm-force", "size", "defaultdestination", "defaultroot") { my $element = $prefs -> getElementsByTagName ($tag); - $retmap{$tag} = $element-> get_node(1)->textContent () if ($element); + $retmap{$tag} = $element->get_node(1)->textContent () if ($element); } # now get the 'type' attributes # example: <type primary="true" boot="isoboot/suse-10.3" flags="compressed">iso</type> @@ -92,6 +94,13 @@ $retmap{$tag} = $element-> get_node(1)->textContent () if ($element); } + my $image = $systemTree -> getElementsByTagName ("image")->get_node (1); + my $image_name = $image -> getAttribute ("name"); + $retmap{"name"} = $image_name if $image_name; + + my $scheme_ver = $image -> getAttribute ("schemeversion"); + $retmap{"schemeversion"} = $scheme_ver if $scheme_ver; + $retmap{"users"} = {}; foreach my $usernode ($usrdataNodeList -> get_nodelist()) { my $group = $usernode -> getAttribute("group"); @@ -128,26 +137,25 @@ } } $key = "repository"; - $retmap{$key} = {}; + my @repolist = (); for (my $i=1;$i<= $repositNodeList->size();$i++) { my $node = $repositNodeList -> get_node($i); - my $type = $node -> getAttribute ("type"); - y2milestone ("repo type: $type"); - my $status = $node -> getAttribute ("status"); - $retmap{$key}{$type} = {}; - $retmap{$key}{$type}{"status"} = $status if $status; - foreach my $tag ("source") { - # maybe it doesn't have sense to have list of sources in one repo... - my @list = (); - foreach my $element ($node -> getElementsByTagName ($tag)) { - my %item = (); - my $path = $element -> getAttribute ("path"); - $item{"path"} = $path if $path; - push @list, \%item if %item; - } - $retmap{$key}{$type}{$tag} = \@list if @list; + my %repo = (); + foreach my $tag ("type", "status") { + my $val = $node -> getAttribute ($tag); + $repo{$tag} = $val if $val; + } + my @list = (); # maybe list is not needed here... + foreach my $element ($node -> getElementsByTagName ("source")) { + my %item = (); + my $path = $element -> getAttribute ("path"); + $item{"path"} = $path if $path; + push @list, \%item if %item; } + $repo{"source"} = \@list if @list; + push @repolist, \%repo if %repo; } + $retmap{$key} = \@repolist if @repolist; ycp::Return (\%retmap, 1); } elsif ($command eq "result") Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/agents/Makefile.am?rev=41019&r1=41018&r2=41019&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/agents/Makefile.am (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/agents/Makefile.am Fri Sep 21 14:52:14 2007 @@ -4,6 +4,6 @@ agent_SCRIPTS = -scrconf_DATA = +scrconf_DATA = cfg_product-creator.scr EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) Added: branches/SuSE-SLE-10-SP1-Branch/product-creator/agents/cfg_product-creator.scr URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/agents/cfg_product-creator.scr?rev=41019&view=auto ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/agents/cfg_product-creator.scr (added) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/agents/cfg_product-creator.scr Fri Sep 21 14:52:14 2007 @@ -0,0 +1,17 @@ +/** + * File: + * cfg_product-creator.scr + * Summary: + * SCR Agent for reading/writing /etc/sysconfig/product-creator + * using the sysconfig-agent + * + * $Id: cfg_product-creator.scr 13009 2003-12-10 13:59:07Z jsuchome $ + * + * Read/Sets the values defined in <tt>/etc/sysconfig/product-creator</tt> + * in an easy manner. + */ +.sysconfig.product-creator + +`ag_ini( + `SysConfigFile("/etc/sysconfig/product-creator") +) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes?rev=41019&r1=41018&r2=41019&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Fri Sep 21 14:52:14 2007 @@ -1,4 +1,27 @@ ------------------------------------------------------------------- +Tue Sep 18 09:46:27 CEST 2007 - jsuchome@suse.cz + +- support for kiwi images templates (F302371) +- support project control for images (F302370) +- use zypper instead of smart +- write schemeversion to config.xml +- directories with templates are specified in sysconfig/product-creator +- enable modifications of configurations without creating images +- do not import already imported and modified configuration +- enable support for unlisted boot images (e.g. netboot) +- show the maximum available space +- use lazy initialization of installation sources +- tell zypper to ignore zypp lock (#310581) +- remove 'prepare' directory before calling kiwi (#325664) +- use defaultroot value from config.xml for 'prepare' directory (F302371) +- 2.13.12 + +------------------------------------------------------------------- +Mon Sep 17 15:27:43 CEST 2007 - jsuchome@suse.cz + +- support installation sources of s390x (#301362) + +------------------------------------------------------------------- Tue Aug 28 10:58:22 CEST 2007 - jsuchome@suse.cz - include the package from "post-packages" section of autoyast Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp?rev=41019&r1=41018&r2=41019&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp Fri Sep 21 14:52:14 2007 @@ -23,15 +23,29 @@ import "String"; string encryption_method = nil; + + // temporary directory, where kiwi is working global string tmp_dir = ""; - global string images_dir = "/usr/share/kiwi/image"; + global string images_dir = Directory::vardir + "/product-creator/images"; list<map> all_sources = []; + // repositories used for current configuration + global map current_repositories = $[]; + // where the kiwi configuration files are stored string config_dir = ""; + // chroot directory for creating the physical extend + string chroot_dir = ""; + + // What we want to create with kiwi + global string kiwi_task = "iso"; + + // map with image templates (to base new projects on) + global map Templates = $[]; + /** * crypt given user password with current encryption algorithm */ @@ -98,7 +112,7 @@ * generate the name of directory with kiwi configuration */ string get_config_dir (string name, string task) { - return "/kw" + task + "-YaST-" + deletechars (name, " \t"); + return deletechars (name, " \t"); } /** @@ -106,12 +120,15 @@ */ map get_type_value (map config, string task) { + string boot_image = sformat ("%1boot/%2", task, config[task + "boot"]:"suse-10.2"); + if (config["type",task,"boot"]:"" != "") + boot_image = config["type",task,"boot"]:""; map ret = $[ "__key" : "type", "__value" : task, "primary" : "true", - "boot" : sformat ("%1boot/%2", task, config[task + "boot"]:"suse-10.2"), -//FIXME (KiwiConfig["compressed"]:false ? ",compressed" : ""), + "boot" : boot_image, +//TODO (KiwiConfig["compressed"]:false ? ",compressed" : ""), ]; if (task != "iso") ret["filesystem"] = "ext3"; @@ -119,6 +136,21 @@ } /** + * generate the list of packages/patterns for image + */ + map get_image_packages (map config, list packages, list patterns,list ignored) + { + map ret = $[ + "__key" : "packages", + "type" : "image", + "__children": union (union (packages, patterns), ignored) + ]; + if (config["image_patternType"]:"" != "") + ret["patternType"] = config["image_patternType"]:""; + return ret; + } + + /** * which keys in config.xml are not unique */ map non_unique_key = $[ @@ -183,41 +215,72 @@ map config = (map) SCR::Read (.kiwi, base_path + "/config.xml"); map packages = config["packages"]:$[]; // rest parts of "packages" are saved in product-creator map - ret["ignore"] = maplist (map p, (list<map>)packages["image","ignore"]:[], ``(p["name"]:"")); + ret["ignore"] = maplist (map p, + (list<map>)packages["image","ignore"]:[], ``(p["name"]:"")); // value of "arch" is currently ignored... foreach (string section, [ "boot", "xen" ], { - ret[section + "_packages"] = - maplist (map p, (list<map>)packages[section, "package"]:[], ``(p["name"]:"")); - ret[section + "_patterns"] = - maplist (map p, (list<map>)packages[section, "opensusePattern"]:[], ``(p["name"]:"")); - ret[section + "_ignore"] = - maplist (map p, (list<map>)packages[section, "ignore"]:[], ``(p["name"]:"")); - }); + ret[section + "_packages"] = maplist (map p, + (list<map>)packages[section, "package"]:[], ``(p["name"]:"")); + ret[section + "_patterns"] = maplist (map p, + (list<map>)packages[section,"opensusePattern"]:[],``(p["name"]:"")); + ret[section + "_ignore"] = maplist (map p, + (list<map>)packages[section, "ignore"]:[], ``(p["name"]:"")); + }); + // list of packages and patterns is needed for import, not for new image + ret["addons"] = maplist (map p, + (list<map>)packages["image","opensusePattern"]:[], ``(p["name"]:"")); + ret["packages"] = maplist (map p, + (list<map>)packages["image","package"]:[], ``(p["name"]:"")); + if (haskey (packages, "delete")) + { + ret["delete_packages"] = maplist (map p, + (list<map>)packages["delete", "package"]:[], ``(p["name"]:"")); + } + + if (packages["image","patternType"]:"" != "") + ret["image_patternType"] = packages["image","patternType"]:""; if (packages["xen","disk"]:"" != "") ret["xen_disk"] = packages["xen","disk"]:""; if (packages["xen","memory"]:"" != "") ret["xen_memory"] = tointeger (packages["xen","memory"]:"512"); -// FIXME read list of packages and patterns???? -> only for non-default! - foreach (string key, [ "author", "contact", "specification", "packagemanager", "version", - "rpm-check-signatures", "rpm-force", "sizeunit", "type" ], { + foreach (string key, [ "author", "contact", "specification", + "packagemanager", "version", "rpm-check-signatures", "rpm-force", + "sizeunit", "type", "name", "repository", "defaultdestination", + "schemeversion", "defaultroot"], + { if (config[key]:nil != nil) ret[key] = config[key]:nil; }); if (haskey (config, "size")) ret["size"] = tointeger (config["size"]:"2700"); - + if (haskey (config, "defaultdestination")) + ret["iso-directory"] = config["defaultdestination"]:""; + foreach (string user, map usermap, (map) config["users"]:$[], { + if (!haskey (ret, "users")) + ret["users"] = $[]; + if (haskey (usermap, "group")) + ret["group"] = usermap["group"]:""; + ret["users",user] = $[ + "home" : usermap["home"]:sformat ("/home/%1", user), + "pwd" : user + ]; + }); return ret; } /** * Write currect configuration to new config.xml */ - global boolean WriteConfigXML (map KiwiConfig, string kiwi_task) { + global boolean WriteConfigXML (map KiwiConfig, string task) { all_sources = Pkg::SourceEditGet(); tmp_dir = Directory::tmpdir; + chroot_dir = tmp_dir + "/myphysical"; + if (KiwiConfig["defaultroot"]:"" != "") + chroot_dir = KiwiConfig["defaultroot"]:""; + list packages_list = []; list patterns_list = []; @@ -283,9 +346,17 @@ ]); }); + list packages_delete_list = maplist (string package, + KiwiConfig["delete_packages"]:[], ``($[ + "__key" : "package", + "name" : package, + ]) + ); + list write_list = [ $[ - "__key" : "image", - "name" : KiwiConfig["name"]:"", + "__key" : "image", + "name" : KiwiConfig["name"]:"", + "schemeversion" : KiwiConfig["schemeversion"]:"1.4", "__children" : [ $[ "__key" : "description", @@ -308,7 +379,7 @@ $[ "__key" : "preferences", "__children" : [ - get_type_value (KiwiConfig, kiwi_task), + get_type_value (KiwiConfig, task), $[ "__key" : "version", "__value" : KiwiConfig["version"]:"1", @@ -320,8 +391,8 @@ ], $[ "__key" : "packagemanager", -// "__value" : "zypper", FIXME still not working for SLES10SP1... - "__value" : "smart", + "__value" : "zypper", +// "__value" : "smart", ], $[ "__key" : "rpm-check-signatures", @@ -331,6 +402,10 @@ "__key" : "rpm-force", "__value" : KiwiConfig["rpm-force"]:"True", ], + $[ + "__key" : "defaultdestination", + "__value" : KiwiConfig["iso-directory"]:"", + ], ], ], ], @@ -357,20 +432,15 @@ ) ); write_list[0,"__children"] = union (write_list[0,"__children"]:[], [ - $[ - "__key" : "packages", - "type" : "image", -// "patternType" : "onlyRequired". // FIXME what does this mean? -// "patternType" : "plusRecommended", - "__children": union (union (packages_list, patterns_list), ignored_list) - ], + get_image_packages ( + KiwiConfig, packages_list, patterns_list, ignored_list), $[ "__key" : "packages", "type" : "boot", "__children": union (union (packages_boot_list, patterns_boot_list), ignored_boot_list) ], ]); - if (kiwi_task == "xen") + if (task == "xen") { write_list[0,"__children"] = add (write_list[0,"__children"]:[], $[ "__key" : "packages", @@ -382,8 +452,17 @@ ]); } + if (packages_delete_list != []) + { + write_list[0,"__children"] = add (write_list[0,"__children"]:[], $[ + "__key" : "packages", + "type" : "delete", + "__children": packages_delete_list + ]); + } + string write_string = Map2XML (write_list[0]:$[], 0); - config_dir = tmp_dir + get_config_dir (KiwiConfig["name"]:"", kiwi_task); + config_dir = tmp_dir + "/" + get_config_dir (KiwiConfig["name"]:"", task); SCR::Execute (.target.mkdir, config_dir); SCR::Write (.target.string, config_dir + "/config.xml", write_string); foreach (string dir, ["root_dir", "config_dir"], { @@ -422,14 +501,13 @@ return false; } - /* rather do not remove, filesystem can be mounted - if (FileUtils::Exists (tmp_dir + "/myphysical")) + if (FileUtils::Exists (chroot_dir)) { - SCR::Execute (.target.bash, sformat ("rm -rf %1/myphysical", tmp_dir)); + y2milestone ("%1 directory is present, removing...", chroot_dir); + SCR::Execute (.target.bash, sformat ("rm -rf %1", chroot_dir)); } - */ - string cmd = sformat ("kiwi --root %1/myphysical --prepare %2 --logfile terminal", tmp_dir, config_dir); + string cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir); y2milestone ("calling '%1'", cmd); @@ -497,8 +575,7 @@ // now continue with creating UI::ChangeWidget (`id(`log), `LastLine, "\n"); - cmd = sformat ("kiwi --create %1/myphysical -d %2 --logfile terminal", - tmp_dir, out_dir); + cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --create %1 -d %2 --logfile terminal", chroot_dir, out_dir); y2milestone ("calling '%1'", cmd); // label UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image")))); @@ -532,11 +609,113 @@ /** * save the image configuration to the kiwi images directory */ - global string SaveConfiguration (map KiwiConfig, string kiwi_task) { + global string SaveConfiguration (map KiwiConfig, string task) { if (config_dir == "" || !FileUtils::Exists (config_dir)) return nil; + if (!FileUtils::Exists (images_dir)) + SCR::Execute (.target.mkdir, images_dir); SCR::Execute (.target.bash, sformat ("cp -ar %1 %2/", config_dir, images_dir)); - return (images_dir + get_config_dir (KiwiConfig["name"]:"", kiwi_task)); + return (images_dir + get_config_dir (KiwiConfig["name"]:"", task)); + } + + /** + * Import repositories from given kiwi image configuration + */ + global map ImportImageRepositories (map Config) { + + current_repositories = $[]; + integer i = 0; + foreach (map repo, (list<map>) Config["repository"]:[], { + string source = repo["source",0,"path"]:""; + if (source != "") + { + string url = ""; + if (substring (source, 0, 1) == "/") + url = "dir://"; + /* + integer id = -1; + if (repo["type"]:"" == "rpm-dir") + { + id = Pkg::SourceCreateType (url + source, "", "Plaindir"); + } + else + id = Pkg::SourceCreate (url + source, ""); + if (id != -1) + current_repositories[id] = url + source; + */ + current_repositories [i] = $[ + "url" : url + source, + "plaindir" : repo["type"]:"" == "rpm-dir" + ]; + i = i + 1; + } + }); + return current_repositories; + } + + /** + * Initialize the list of current repositories + */ +// global map InitCurrentRepositories () { + global map InitCurrentRepositories () { + + Pkg::SourceRestore (); + integer i = 0; + foreach (map source, Pkg::SourceEditGet (), { + integer srcid = source["SrcId"]:-1; + map data = Pkg::SourceGeneralData (srcid); + string url = data["url"]:""; +// current_repositories[srcid] = url; + current_repositories[i] = $[ + "url" : url, + "plaindir" : data["type"]:"" == "Plaindir" + ]; + i = i + 1; + }); + return current_repositories; + } + + /** + * Read the templates on which the images can be based + */ + global boolean ReadImageTemplates () { + + /* + // get the list of directories with templates from config file + string file = Directory::vardir + "/product-creator/image_templates"; + if (!FileUtils::Exists (file)) + { + SCR::Execute (.target.bash, sformat ("cp %1/image_templates %2/", + Directory::datadir + "/product-creator", + Directory::vardir + "/product-creator")); + } + + string cont = (string) SCR::Read (.target.string, file); + if (cont == nil) + return false; + */ + string dirs = (string)SCR::Read(.sysconfig.product-creator.IMAGE_TEMPLATES); + foreach (string line, splitstring (dirs, "\t "), { + if (line == "" || substring (line, 0, 1) == "#") + return; + if (!FileUtils::IsDirectory (line)) + { + y2warning ("%1 is not a directory", line); + return; + } + map out = (map) SCR::Execute (.target.bash_output, + sformat ("ls -A1 %1", line)); + foreach (string d, splitstring(out["stdout"]:"", "\n"), { + if (d == "") return; + map config = Kiwi::ReadConfigXML (line + "/" + d); + + // index by full path, there may be same names + // (templates could be provided by different vendors) + if (config != nil && config != $[]) + Templates[line + "/" + d] = config; + }); + }); + return true; } } Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Makefile.am?rev=41019&r1=41018&r2=41019&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Makefile.am (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Makefile.am Fri Sep 21 14:52:14 2007 @@ -8,7 +8,8 @@ YCPCFLAGS = -I ./include client_DATA = \ - product-creator.ycp + product-creator.ycp \ + image-creator.ycp ynclude_DATA = \ helps.ycp \ @@ -17,11 +18,11 @@ complex.ycp \ routines.ycp \ commandline.ycp \ - kiwi.ycp - + kiwi_dialogs.ycp desktop_DATA = \ - product-creator.desktop + product-creator.desktop \ + image-creator.desktop module_DATA = \ ProductCreator.ycp \ Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp?rev=41019&r1=41018&r2=41019&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp Fri Sep 21 14:52:14 2007 @@ -62,6 +62,7 @@ global boolean profile_parsed = false; +global integer max_size_mb = 999 * 1024; /* Configuration Map */ global map Config = $[]; @@ -90,8 +91,8 @@ global boolean proposal_valid = false; -// What we want to create with kiwi -global string kiwi_task = "iso"; +// if the YaST sources should be enabled when opening package selector +global boolean enable_sources = true; // original source configuration, needed to reset the package manager list > original_config = nil; @@ -125,6 +126,8 @@ global boolean isCode10Source() { boolean code10 = false; + string arch = Arch::architecture (); + if (arch == "s390_64") arch = "s390x"; foreach (string url , ProductCreator::Config["sources"]:[], { integer i = SourceManager::getSourceId(url); @@ -141,7 +144,7 @@ { list<string> items = splitstring(dir_listing, "\n"); - code10 = code10 || contains(items, Arch::architecture() + "/"); + code10 = code10 || contains(items, arch + "/"); } } }); @@ -558,7 +561,9 @@ } else { - bootconfig_path = sformat("boot/%1/loader/isolinux.cfg", Arch::architecture()); + string arch = Arch::architecture(); + if (arch == "s390_64") arch = "s390x"; + bootconfig_path = sformat("boot/%1/loader/isolinux.cfg", arch); list<integer> srcids = [checkProductDependency()]; @@ -1041,6 +1046,7 @@ integer sles_src = 0; string descr_dir = ""; string arch = Arch::architecture(); + if (arch == "s390_64") arch = "s390x"; y2milestone("Config: %1", Config); @@ -1776,6 +1782,7 @@ string cpCmd = ""; string arch = Arch::architecture(); + if (arch == "s390_64") arch = "s390x"; y2debug("isolinux.cfg: %1", Config["bootconfig"]:"" ); if (Config["bootconfig"]:"" != "") { @@ -1889,6 +1896,10 @@ global define void enableSources()``{ + // used by standalone kiwi UI, which does onw sources handling... + if (!enable_sources) + return; + // TODO FIXME: use better way to reset the source config in the package manager if (original_config != nil) { Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp?rev=41019&r1=41018&r2=41019&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp Fri Sep 21 14:52:14 2007 @@ -11,18 +11,19 @@ textdomain "product-creator"; - import "Wizard"; - import "Popup"; - import "Wizard_hw"; - import "Report"; import "Arch"; - import "String"; - - import "ProductCreator"; - + import "CommandLine"; + import "Directory"; + import "FileUtils"; + import "Kiwi"; import "Label"; import "Mode"; - import "CommandLine"; + import "Popup"; + import "ProductCreator"; + import "Report"; + import "String"; + import "Wizard"; + import "Wizard_hw"; include "product-creator/helps.ycp"; include "product-creator/dialogs.ycp"; @@ -136,7 +137,7 @@ break; } /* edit */ - else if(ret == `edit_button) { + else if(ret == `edit_button || ret == `table) { ProductCreator::LoadConfig(current); ret = `edit; break; @@ -172,7 +173,7 @@ Package::InstallAll (["kiwi", "kiwi-desc-isoboot"])) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); ProductCreator::Config = ProductCreator::Configs[current]:$[]; - ProductCreator::kiwi_task = "iso"; + Kiwi::kiwi_task = "iso"; ret = `kiwi; break; } @@ -180,7 +181,7 @@ Package::InstallAll (["kiwi", "kiwi-desc-xenboot"])) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); ProductCreator::Config = ProductCreator::Configs[current]:$[]; - ProductCreator::kiwi_task = "xen"; + Kiwi::kiwi_task = "xen"; ret = `kiwi; break; } @@ -188,7 +189,7 @@ Package::InstallAll (["kiwi", "kiwi-desc-usbboot"])) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); ProductCreator::Config = ProductCreator::Configs[current]:$[]; - ProductCreator::kiwi_task = "usb"; + Kiwi::kiwi_task = "usb"; ret = `kiwi; break; } @@ -196,7 +197,7 @@ Package::InstallAll (["kiwi", "kiwi-desc-vmxboot"])) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); ProductCreator::Config = ProductCreator::Configs[current]:$[]; - ProductCreator::kiwi_task = "vmx"; + Kiwi::kiwi_task = "vmx"; ret = `kiwi; break; } @@ -527,6 +528,172 @@ return `next; } +/** + * overview dialog with image configurations + */ +define symbol ImagesOverviewDialog() { + + list overview = []; + map Configurations = $[]; + + string images_dir = Kiwi::images_dir; + if (!FileUtils::Exists (images_dir)) + SCR::Execute (.target.mkdir, images_dir); + + map out = (map) SCR::Execute (.target.bash_output, + sformat ("ls -A1 %1", images_dir)); + if (out != $[]) + { + foreach (string d, splitstring(out["stdout"]:"", "\n"), { + if (d == "") return; + if (FileUtils::Exists (images_dir + "/" + d + "/config.xml")) + { + map config = Kiwi::ReadConfigXML (images_dir + "/" + d); + string task = "iso"; + // FIXME duplicated in kiwi_dialogs + foreach (string type, map data, config["type"]:$[], { + task = type; + if (data["primary"]:"" == "true") + break; + }); + + config["kiwi_configuration_" + task] = images_dir + "/" + d; + config["current_task"] = task; + + string name = config["name"]:d; + Configurations[name] = config; + overview = add (overview, `item ( + `id (name), name, + config["version"]:"1", config["size"]:0 + )); + } + }); + } + + // help text + string help_text = _("<p>Start the creating of new image configuration with <b>Add</b>.</p>") + + + // help text + _("<p>Use <b>Edit</b> to change selected image configuration or create the image.</p>") + + + // help text + _("<p>Delete the directory with selected configuration using <b>Delete</b>.</p>") + + + // help text, %1 is directory + sformat (_("<p>All image configurations are saved in <tt>%1</tt> directory.</p>"), images_dir); + + // main dialog caption + string caption = _("Image Creator Configuration Overview"); + + term contents = `VBox ( + `VWeight (3, `Table (`id (`table), `opt (`notify, `immediate), + `header (_("Name"), _("Version"), _("Size")), + overview + )), + `VWeight (1, `RichText (`id (`descr), "")), + `HBox ( + `PushButton (`id (`add), `opt (`key_F3), Label::AddButton ()), + `PushButton (`id (`delete), `opt (`key_F5), Label::DeleteButton ()), + `PushButton (`id (`edit), `opt (`key_F4), Label::EditButton ()), + `HStretch () + ) + ); + + contents = Wizard_hw::SpacingAround(contents, 1.5, 1.5, 1.0, 1.0); + + Wizard::SetContentsButtons(caption, contents, help_text, + Label::BackButton(), Label::CloseButton()); + Wizard::HideBackButton(); + Wizard::HideAbortButton(); + + UI::ChangeWidget (`id (`edit), `Enabled, size (overview) > 0); + if (size (overview) > 0) + { + string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); + string val = Configurations[current,"specification"]:""; + UI::ChangeWidget (`id (`descr), `Value, + mergestring (splitstring(String::EscapeTags (val), "\n"), "<br>")); + } + + any ret = nil; + while(true) { + + ret = UI::UserInput(); + string current = (string) UI::QueryWidget(`id(`table), `CurrentItem ); + + if(ret == `abort || ret == `cancel) { + if(ProductCreator::ReallyAbort()) break; + else continue; + } + else if (ret == `table) + { + UI::ChangeWidget (`id (`descr), `Value, + Configurations[current,"specification"]:""); + } + else if (ret == `add) + { + ProductCreator::Config = $[]; + ret = `kiwi; + break; + } + else if(ret == `delete) + { + if (Popup::YesNo ( +// yes/no popup +sformat (_("Delete configutation %1 now?"), current))) + { + map config = Configurations[current]:$[]; + string dir = + config["kiwi_configuration_"+ config["current_task"]:""]:""; + // TODO at the end? (solve possible new config with same name..) + if (dir != "" && issubstring (dir, Directory::vardir)) + SCR::Execute (.target.bash, "rm -rf " + dir); + Configurations = remove (Configurations, current); + overview = filter (term it, (list<term>) overview, + ``(it[0,0]:"" != current)); + UI::ChangeWidget (`id (`table), `Items, overview); + } + } + else if (ret == `edit) + { + ProductCreator::Config = Configurations[current]:$[]; + string task = ProductCreator::Config["current_task"]:""; + list<string> to_install = [ "kiwi" ]; + if (contains ([ "iso", "xen", "vmx", "usb" ], task)) + { + string bootdir = ProductCreator::Config["type",task,"boot"]:""; + if (bootdir == "" || + !FileUtils::Exists ("/usr/share/kiwi/image/" + bootdir)) + { + to_install = add (to_install, sformat("kiwi-desc-%1boot", task)); + } + } + if (Package::InstallAll (to_install)) + { + Kiwi::ImportImageRepositories (ProductCreator::Config); + Kiwi::kiwi_task = task; + ret = `kiwi; + break; + } + continue; + } + else if (ret == `next || ret == `back) { + break; + } + else { + y2error("unexpected retcode: %1", ret); + continue; + } + } + if (ret == `kiwi) + { + // we do import own sources... + ProductCreator::enable_sources = false; + // ask on abort... + ProductCreator::modified = true; + } + return (symbol)ret; +} /* EOF */ } Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/Makefile.am?rev=41019&r1=41018&r2=41019&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/Makefile.am (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/Makefile.am Fri Sep 21 14:52:14 2007 @@ -11,4 +11,8 @@ message \ options.msg -EXTRA_DIST = $(ydata_DATA) +fillup_DATA = sysconfig.product-creator + +fillupdir = /var/adm/fillup-templates + +EXTRA_DIST = $(ydata_DATA) $(fillup_DATA) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/kiwi_templates/iso/config.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/kiwi_templates/iso/config.xml?rev=41019&r1=41018&r2=41019&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/kiwi_templates/iso/config.xml (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/kiwi_templates/iso/config.xml Fri Sep 21 14:52:14 2007 @@ -7,7 +7,6 @@ <preferences> <version>1</version> <size unit="M">2700</size> - <packagemanager>smart</packagemanager> <rpm-check-signatures>False</rpm-check-signatures> <rpm-force>True</rpm-force> </preferences> @@ -18,9 +17,7 @@ <opensusePattern name="base"/> <opensusePattern name="x11"/> <opensusePattern name="apparmor"/> - <opensusePattern name="imaging"/> <opensusePattern name="kde"/> - <opensusePattern name="kde_imaging"/> <ignore name="smtp_daemon"/> <ignore name="pfscalibratio"/> <ignore name="jaf-demo"/> Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/kiwi_templates/xen/config.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/kiwi_templates/xen/config.xml?rev=41019&r1=41018&r2=41019&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/kiwi_templates/xen/config.xml (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/kiwi_templates/xen/config.xml Fri Sep 21 14:52:14 2007 @@ -7,7 +7,6 @@ <preferences> <version>1</version> <size unit="M">2700</size> - <packagemanager>smart</packagemanager> <rpm-check-signatures>False</rpm-check-signatures> <rpm-force>True</rpm-force> </preferences> Added: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/sysconfig.product-creator URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/sysconfig.product-creator?rev=41019&view=auto ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/sysconfig.product-creator (added) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/sysconfig.product-creator Fri Sep 21 14:52:14 2007 @@ -0,0 +1,20 @@ +## Path: System/Yast2/Product-creator +## Description: YaST2 Product Creator +## Type: string +## Default: none +# +# List of full paths to directories storing the image configuration templates. +# Items are separated by spaces. +# +# +IMAGE_TEMPLATES="" + +## Path: System/Yast2/Product-creator +## Description: YaST2 Product Creator +## Type: string +## Default: "/var/lib/YaST2/product-creator/images" +# +# Path to the directory storing image configurations for Image Creator. +# +# +IMAGE_CONFIGURATIONS="/var/lib/YaST2/product-creator/images" Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/dialogs.ycp?rev=41019&r1=41018&r2=41019&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/dialogs.ycp Fri Sep 21 14:52:14 2007 @@ -25,6 +25,7 @@ import "GPGWidgets"; import "CWM"; import "String"; + import "Package"; include "product-creator/helps.ycp"; @@ -503,6 +504,9 @@ map general_info = Pkg::SourceGeneralData(SrcID); boolean found_architecture = false; + string arch = Arch::architecture (); + if (arch == "s390_64") arch = "s390x"; + // architecture check is possible only for YaST sources if (general_info["type"]:"" == "YaST") { @@ -512,7 +516,7 @@ foreach(string key, string value, read_content, { - if (key == "ARCH." + Arch::architecture()) + if (key == "ARCH." + arch) { found_architecture = true; break; @@ -526,7 +530,7 @@ found_architecture = true; } - y2milestone("Architecture %1 is supported: %2", Arch::architecture(), found_architecture); + y2milestone("Architecture %1 is supported: %2", arch, found_architecture); if (true) { @@ -541,7 +545,7 @@ { Report::Error(sformat(_("The source does not support the architecture of this machine (%1). Select another source. -"), Arch::architecture())); +"), arch)); } } else if (ret == `remove) @@ -870,7 +874,10 @@ any ret = nil; // set a mount point - there is no use to display DU of the current system - Pkg::TargetInitDU([ $[ "name" : "/", "free" : 999*1024*1024 /* 999GB */, "used" : 0, "readonly" : false ] ]); + Pkg::TargetInitDU([ $[ "name" : "/", + "free" : ProductCreator::max_size_mb * 1024, + "used" : 0, "readonly" : false ] + ]); /* dialog caption */ string caption = _("Software Selection"); Added: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/image-creator.desktop URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/image-creator.desktop?rev=41019&view=auto ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/image-creator.desktop (added) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/image-creator.desktop Fri Sep 21 14:52:14 2007 @@ -0,0 +1,23 @@ +[Desktop Entry] +Type=Application +Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; + +X-KDE-ModuleType=Library +X-KDE-RootOnly=true +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=image-creator + +X-SuSE-YaST-Group=Misc +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst= +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= + +Icon=yast-cd-creator +Exec=/sbin/yast2 image-creator + +Name=Image Creator +GenericName=Create the Live CD, USB or XEN image +X-KDE-SubstituteUID=true Added: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/image-creator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/image-creator.ycp?rev=41019&view=auto ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/image-creator.ycp (added) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/image-creator.ycp Fri Sep 21 14:52:14 2007 @@ -0,0 +1,65 @@ +/** + * $Id$ + * + */ + +{ + +textdomain "product-creator"; + +import "CommandLine"; +import "Confirm"; +import "FileUtils"; +import "Kiwi"; +import "Label"; +import "ProductCreator"; +import "Sequencer"; +import "Wizard"; +import "Wizard_hw"; + +include "product-creator/wizards.ycp"; + + + +// TODO merge with main product-creator sequence? +define boolean ICSequence() { + + Wizard::CreateDialog(); + Wizard::SetDesktopIcon("cd-creator"); + + if (!Confirm::MustBeRoot ()) + { + UI::CloseDialog (); + return false; + } + + if (!Package::InstallAll (["kiwi", "yast2-instserver"])) + { + Popup::Error(_("Installation of required packages +failed.")); + UI::CloseDialog (); + return false; + } + + symbol ret = ImageCreatorSequence (); + + UI::CloseDialog(); + return ret == `next; +} + +map cmdline_description = $[ + "id" : "image-creator", + // transltors: command line help text for the Xproduct-creator module + "help" : _("Configuration of Image creator"), + "guihandler" : ICSequence, +]; + + +/* start the module */ +any ret = CommandLine::Run(cmdline_description); +y2debug("ret=%1", ret); + +return ret; + +/* EOF */ +} Added: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp?rev=41019&view=auto ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (added) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Fri Sep 21 14:52:14 2007 @@ -0,0 +1,1897 @@ +/** + * File: include/product-creator/kiwi.ycp + * Package: Configuration of product-creator + * Summary: Dialogs for kiwi configuration + * Authors: Jiri Suchomel + * + * $Id$ + */ +{ + textdomain "product-creator"; + + import "CWM"; + import "CWMTab"; + import "Directory"; + import "ProductCreator"; + import "FileUtils"; + import "Label"; + import "Kiwi"; + import "Popup"; + import "SourceDialogs"; + import "Summary"; + import "URL"; + import "Wizard"; + + include "product-creator/dialogs.ycp"; + + // map of current image configuration + map KiwiConfig = $[]; + + // what are we configuring now ("iso"/"xen"/...) + string kiwi_task = ""; + + // return the id of actual widget for boot image + string boot_image_widget () { + return kiwi_task + "boot"; + } + + // read available the images under /usr/share/kiwi/image/ directory + list<term> GetAvailableImages (string subdir) { + + list<term> ret = []; + string dir = "/usr/share/kiwi/image/"; + map out = (map) SCR::Execute (.target.bash_output, + sformat ("ls %1/%2", dir, subdir)); + if (out["exit"]:0 != 0) + return ret; + foreach (string file, splitstring (out["stdout"]:"", "\n"), { + if (file != "" && FileUtils::IsDirectory (sformat ("%1/%2/%3", dir, subdir, file))) + { + ret = add (ret, `item (`id(file), file, file == KiwiConfig[subdir]:"")); + } + }); + return ret; + } + + /******************************************************************************************** + * widget handlers + *******************************************************************************************/ + + /** + * Initialize the widget with ignored packages + */ + define void InitSWIgnore (string id) { + string sw_selection = KiwiConfig["sw_selection"]:"image"; + string ignore_key = sw_selection == "image" ? "ignore" : (sw_selection + "_ignore"); + UI::ChangeWidget (`id (id), `Value, mergestring (KiwiConfig[ignore_key]:[], "\n")); + } + + define void StoreSWIgnore (string key, map event) { + string sw_selection = KiwiConfig["sw_selection"]:"image"; + string ignore_key = sw_selection == "image" ? "ignore" : (sw_selection + "_ignore"); + KiwiConfig[ignore_key] = filter (string p, + splitstring ((string) UI::QueryWidget(`id(key), `Value), "\n"), ``(p != "")); + } + + define symbol HandleSWIgnore (string key, map event) { + if (event["ID"]:nil == `next) StoreSWIgnore (key, event); + return nil; + } + + /** + * Initialize the widget with packages intended for deletion + */ + define void InitSWDelete (string id) { + UI::ChangeWidget (`id (id), `Value, mergestring (KiwiConfig["delete_packages"]:[], "\n")); + } + + define void StoreSWDelete (string key, map event) { + string ignore_key = "delete_packages"; + KiwiConfig[ignore_key] = filter (string p, + splitstring ((string) UI::QueryWidget(`id(key), `Value), "\n"), ``(p != "")); + } + + define symbol HandleSWDelete (string key, map event) { + if (event["ID"]:nil == `next) StoreSWDelete (key, event); + return nil; + } + + /** + * Initialize the contents of richtext with selected software + */ + define void InitSWRichText (string id) { + + string sw_selection = KiwiConfig["sw_selection"]:"image"; + string pattern_key = sw_selection == "image" ? "addons" : (sw_selection + "_patterns"); + string rt = ""; + if (KiwiConfig[pattern_key]:[] != []) + { + // richtext header + rt = Summary::AddHeader ("", _("Patterns")); + foreach (string pattern, (list<string>) KiwiConfig[pattern_key]:[], { + rt = Summary::AddListItem (rt, pattern); + }); + } + string package_key = sw_selection == "image" ? "packages" : (sw_selection + "_packages"); + if (KiwiConfig[package_key]:[] != []) + { + // richtext header + rt = Summary::AddHeader (rt, _("Packages")); + foreach (string package, (list<string>) KiwiConfig[package_key]:[], { + rt = Summary::AddListItem (rt, package); + }); + } + UI::ChangeWidget (`id (id), `Value, rt); + } + + /** + * Handler for software selection + */ + define symbol HandleSWSelection (string key, map event) { + if (event["ID"]:nil == key) + { + string sw_selection = KiwiConfig["sw_selection"]:"image"; + + integer mbytes = (integer) UI::QueryWidget (`id ("size"), `Value); + if (UI::QueryWidget (`id ("sizeunit"), `Value) == "G") + mbytes = mbytes * 1024; + ProductCreator::max_size_mb = mbytes; + if (sw_selection == "image" && packageSelector () != `cancel) + { + KiwiConfig["addons"] = ProductCreator::Config["addons"]:[]; + KiwiConfig["packages"] = ProductCreator::Config["packages"]:[]; + InitSWRichText ("rt_sw"); + if (ProductCreator::Config["taboo"]:[] != nil) + { + //FIXME do not replace current 'ignored' tags... + KiwiConfig["ignore"] = union (KiwiConfig["ignore"]:[], + ProductCreator::Config["taboo"]:[]); + InitSWIgnore ("ignore"); + } + } + else if (sw_selection != "image") + { + map selected = runPackageSelector ("", + KiwiConfig[sw_selection + "_patterns"]:[], + KiwiConfig[sw_selection + "_packages"]:[], + KiwiConfig[sw_selection + "_ignore"]:[], + `packages + ); + KiwiConfig[sw_selection + "_patterns"] = selected["addons"]:[]; + KiwiConfig[sw_selection + "_packages"] = selected["packages"]:[]; + InitSWRichText ("rt_sw"); + if (ProductCreator::Config["taboo"]:[] != nil) + { + KiwiConfig["ignore"] = ProductCreator::Config["taboo"]:[]; + InitSWIgnore ("ignore"); + } + } + } + return nil; + } + + /** + * initialize the combo box with package selection groups + */ + define void InitSWSelectionCombo (string id) { + string sw_selection = KiwiConfig["sw_selection"]:"image"; + list items = [ + `item (`id ("image"), _("Image"), sw_selection == "image"), + ]; + if (kiwi_task == "xen") + items = add (items, `item (`id ("xen"), _("Xen Specific"), sw_selection == "xen")); + UI::ChangeWidget (`id (id), `Items, items); + } + + define void StoreSWSelectionCombo (string key, map event) { + KiwiConfig[key] = (string) UI::QueryWidget(`id(key), `Value); + } + + /** + * handler for combo box with isoboot items + */ + define symbol HandleSWSelectionCombo (string key, map event) { + any id = event["ID"]:nil; + // store the value on exiting + if (id == `next) StoreSWSelectionCombo (key, event); + else if (event["ID"]:nil == key) + { + string selected = (string) UI::QueryWidget(`id(key), `Value); + if (selected != KiwiConfig["sw_selection"]:"image") + { + StoreSWIgnore ("ignore", event); + StoreSWSelectionCombo (key, event); + InitSWRichText ("rt_sw"); + InitSWIgnore ("ignore"); + } + } + return nil; + } + + + /** + * initialize the value of combo box with isoboot items + */ + define void InitBootCombo (string id) { + UI::ChangeWidget (`id (id), `Items, GetAvailableImages (id)); + } + + /** + * store the value of current isoboot image + */ + define void StoreBootCombo (string key, map event) { + KiwiConfig[key] = (string) UI::QueryWidget(`id(key), `Value); + } + /** + * handler for combo box with isoboot items + */ + define symbol HandleBootCombo (string key, map event) { + // store the value on exiting + if (event["ID"]:nil == `next) StoreBootCombo (key, event); + return nil; + } + + /** + * initialize the value of compress checkbox + */ + define void InitCompressCheckBox (string id) { + UI::ChangeWidget (`id (id), `Enabled, false); + UI::ChangeWidget (`id (id), `Value, KiwiConfig["compressed"]:false); + } + + /** + * store the value of compress checkbox + */ + define void StoreCompressCheckBox (string key, map event) { + KiwiConfig["compressed"] = (boolean) UI::QueryWidget(`id(key), `Value); + } + /** + * handler for compress checkbox + */ + define symbol HandleCompressCheckBox (string key, map event) { + // store the value on exiting + if (event["ID"]:nil == `next) StoreCompressCheckBox (key, event); + return nil; + } + + /** + * initialize the value of version + */ + define void InitVersion (string id) { + UI::ChangeWidget (`id (id), `Value, sformat ("%1", KiwiConfig[id]:"1")); + } + + /** + * store the value of current version + */ + define void StoreVersion (string key, map event) { + KiwiConfig[key] = sformat ("%1", UI::QueryWidget(`id(key), `Value)); + } + + /** + * handler for version + */ + define symbol HandleVersion (string key, map event) { + // store the value on exiting + if (event["ID"]:nil == `next) StoreVersion (key, event); + return nil; + } + + /** + * initialize the value of combo box with isoboot items + */ + define void InitSizeUnitCombo (string id) { + UI::ChangeWidget (`id (id), `Items, maplist (string u, [ "M", "G" ], ``( + `item (`id (u), u + "B", KiwiConfig[id]:"M" == u)) + )); + } + + /** + * initialize the value of version + */ + define void InitSize (string id) { + UI::ChangeWidget (`id (id), `Value, KiwiConfig[id]:2700); + } + + /** + * initialize the product label + */ + define void InitLabel (string id) { + UI::ChangeWidget (`id ("name"), `Value, KiwiConfig["name"]:""); + } + + + /** + * universal widget: initialize the string value of widget @param + */ + define void InitDescription (string id) { + UI::ChangeWidget (`id (id), `Value, KiwiConfig[id]:""); + } + + /** + * store the string value of given widget + */ + define void StoreDescription (string key, map event) { + KiwiConfig[key] = UI::QueryWidget (`id(key), `Value); + } + + /** + * handler for general string-value widgets: store their value on exit/save + */ + define symbol HandleDescription (string key, map event) { + // store the value on exiting + if (event["ID"]:nil == `next) StoreDescription (key, event); + return nil; + } + + define void InitOutputDir (string id) { + UI::ChangeWidget (`id (id), `Value, KiwiConfig["iso-directory"]:""); + } + + /** + * initialize the table with users + */ + define void InitUsersTable (string id) { + + list items = maplist (string user, map usermap, (map) KiwiConfig["users"]:$[], + ``(`item (`id (user), user, usermap["home"]:""))); + UI::ChangeWidget (`id ("table"), `Items, items); + UI::ChangeWidget (`id ("edituser"), `Enabled, size (items) > 0); + UI::ChangeWidget (`id ("deleteuser"), `Enabled, size (items) > 0); + } + + /** + * Handle changes in users table + */ + define symbol HandleAddEditUser (string key, map event) { + if (event["ID"]:nil != key && (key != "userstable" || event["ID"]:nil != "table")) return nil; + + if (key == "userstable") key = "edituser"; + string current_user = (string) UI::QueryWidget (`id ("table"), `CurrentItem); + + UI::OpenDialog (`opt(`decorated), `HBox (`HSpacing (0.5), `VBox ( + `VSpacing (0.5), + // popup label + `Label (`id (`label), _("Add new user")), + // text entry label + `TextEntry (`id (`username), _("&Name")), + `Password (`id (`pw1), Label::Password(), ""), + `Password (`id(`pw2), Label::ConfirmPassword(), ""), + `TextEntry (`id (`home), _("&Home Directory")), + `HBox ( + `PushButton (`id(`ok),`opt(`key_F10), Label::OKButton()), + `PushButton (`id(`cancel),`opt(`key_F9), Label::CancelButton()) + ), + `VSpacing (0.5)), `HSpacing (0.5)) + ); + if (key == "edituser") + { + UI::ChangeWidget (`id (`username), `Value, current_user); + UI::ChangeWidget (`id (`home), `Value, KiwiConfig["users", current_user, "home"]:""); + UI::ChangeWidget (`id (`pw1), `Value, "*****"); + UI::ChangeWidget (`id (`pw2), `Value, "*****"); + // popup label + UI::ChangeWidget (`id (`label), `Value, _("Edit User")); + } + any ret = nil; + repeat + { + ret = UI::UserInput (); + if (ret == `ok) + { + string username = (string) UI::QueryWidget (`id(`username), `Value); + string pwd = (string) UI::QueryWidget (`id(`pw1), `Value); + if (username == "") + { + // popup message + Report::Error (_("Enter the user name.")); + ret = `notnext; + continue; + } + if (pwd != UI::QueryWidget (`id(`pw2), `Value)) + { + // popup message + Report::Error (_("The passwords do not match. +Try again.")); + ret = `notnext; + continue; + } + if (pwd == "") + { + // popup message + Report::Error (_("Enter the user password.")); + ret = `notnext; + continue; + } + if (! haskey (KiwiConfig, "users")) + KiwiConfig["users"] = $[]; + else if (key == "edituser" && username != current_user) + KiwiConfig["users"] = remove (KiwiConfig["users"]:$[], current_user); + KiwiConfig["users", username] = $[ + "pwd" : pwd, + "home" : UI::QueryWidget (`id(`home), `Value) + ]; + } + } until (ret == `ok || ret == `cancel); + + UI::CloseDialog (); + if (ret == `ok) InitUsersTable ("table"); + return nil; + } + + /** + * handle delete user button + */ + define symbol HandleDeleteUser (string key, map event) { + if (event["ID"]:nil != key) return nil; + + string current_user = (string) UI::QueryWidget (`id ("table"), `CurrentItem); + KiwiConfig["users"] = remove (KiwiConfig["users"]:$[], current_user); + InitUsersTable ("table"); + return nil; + } + + /** + * initialize the table with root dir contents + */ + define void InitRootDirTable (string id) { + + list items = maplist (string file, (list<string>) KiwiConfig["root_dir"]:[], { +// return `item (`id (file), substring (file, findlastof (file, "/") + 1)); + return `item (`id (file), file); + }); + UI::ChangeWidget (`id ("roottable"), `Items, items); + UI::ChangeWidget (`id ("root_dir_delete"), `Enabled, size (items) > 0); + } + + // add new subdir to the 'root' directory + define symbol HandleAddToRootDir (string key, map event) { + + if (event["ID"]:nil != key) return nil; + // popup for file selection dialog + string dir = UI::AskForExistingDirectory ("", _("Directory to Import")); + if (dir!= nil) + { + KiwiConfig["root_dir"] = union (KiwiConfig["root_dir"]:[], [dir]); + InitRootDirTable ("roottable"); + } + return nil; + } + + // delete subdir from the 'root' directory + define symbol HandleDeleteFromRootDir (string key, map event) { + if (event["ID"]:nil != key) return nil; + string current = (string) UI::QueryWidget (`id ("roottable"), `Value); + KiwiConfig["root_dir"] = filter (string f, KiwiConfig["root_dir"]:[], ``(f != current)); + InitRootDirTable ("roottable"); + return nil; + } + + /** + * initialize the table with config dir contents + */ + define void InitConfigDirTable (string id) { + + list items = maplist (string file, (list<string>) KiwiConfig["config_dir"]:[], { +// return `item (`id (file), substring (file, findlastof (file, "/") + 1)); + return `item (`id (file), file); + }); + UI::ChangeWidget (`id ("configtable"), `Items, items); + UI::ChangeWidget (`id ("config_dir_delete"), `Enabled, size (items) > 0); + } + + // add new subdir to the 'config' directory + define symbol HandleAddToConfigDir (string key, map event) { + + if (event["ID"]:nil != key) return nil; + // popup for file selection dialog + string dir = UI::AskForExistingFile ("", "", _("Script to Import")); + if (dir!= nil) + { + KiwiConfig["config_dir"] = union (KiwiConfig["config_dir"]:[], [dir]); + InitConfigDirTable ("configtable"); + } + return nil; + } + + // delete subdir from the 'config' directory + define symbol HandleDeleteFromConfigDir (string key, map event) { + if (event["ID"]:nil != key) return nil; + string current = (string) UI::QueryWidget (`id ("configtable"), `Value); + KiwiConfig["config_dir"] = filter (string f, KiwiConfig["config_dir"]:[], ``(f != current)); + InitConfigDirTable ("configtable"); + return nil; + } + + /** + * universal handler for directory browsing + */ + string BrowseDirectoryHandler (string key, string label) { + + string current = (string) UI::QueryWidget (`id (key), `Value); + if (current == nil) current = ""; + string dir = UI::AskForExistingDirectory (current, label); + if (dir!= nil) + { + UI::ChangeWidget (`id (key), `Value, dir); + StoreDescription (key, $[]); + } + return dir; + } + + /** + * handler for 'root' directory browse + */ + symbol HandleBrowseRootDirectory (string key, map event) { + if (event["ID"]:nil != key) return nil; + // popup for file selection dialog ('root' is a name, do not translate) + BrowseDirectoryHandler ("root_dir", _("Path to root Directory")); + return nil; + } + + /** + * handler for 'config' directory browse + */ + symbol HandleBrowseConfigDirectory (string key, map event) { + if (event["ID"]:nil != key) return nil; + // popup for file selection dialog ('config' is a name, do not translate) + BrowseDirectoryHandler ("config_dir", _("Path to config Directory")); + return nil; + } + + /** + * handler for output directory browse + */ + symbol HandleBrowseOutputDirectory (string key, map event) { + if (event["ID"]:nil != key) return nil; + // popup for file selection dialog + BrowseDirectoryHandler ("output_dir", _("Path to the Output Directory")); + return nil; + } + + /** + * universal handler for file browsing + */ + string BrowseFileHandler (string key, string label) { + + string current = (string) UI::QueryWidget (`id (key), `Value); + if (current == nil) current = ""; + string file = UI::AskForExistingFile (current, "", label); + if (file != nil && key != "config.sh") + { + UI::ChangeWidget (`id (key), `Value, file); + StoreDescription (key, $[]); + } + return file; + } + + /** + * Handler for browsing for images.sh file + */ + symbol HandleBrowseImagesFile (string key, map event) { + if (event["ID"]:nil != key) return nil; + // popup for file selection dialog + BrowseFileHandler ("images_path", _("Path to images.sh File")); + return nil; + } + + /** + * Handler for browsing for autoyast profile + */ + symbol HandleBrowseAutoYaSTFile (string key, map event) { + if (event["ID"]:nil != key) return nil; + // popup for file selection dialog + BrowseFileHandler ("autoyast_path", _("Path to AutoYaST Profile")); + return nil; + } + + /** + * Handler for importing config.sh file + */ + symbol HandleImportConfigFile (string key, map event) { + if (event["ID"]:nil != key) return nil; + // popup for file selection dialog + string file = BrowseFileHandler ("config.sh", _("Path to config.sh File")); + if (file != nil) + { + if (FileUtils::Exists (file)) + { + string configsh = (string) SCR::Read (.target.string, file); + if (configsh != nil) + { + UI::ChangeWidget (`id ("config.sh"), `Value, configsh); + StoreDescription ("config.sh", event); + } + } + } + return nil; + } + + /** + * Handler for importing images.sh file + * TODO same function as HandleImportConfigFile + */ + symbol HandleImportImagesFile (string key, map event) { + if (event["ID"]:nil != key) return nil; + // popup for file selection dialog + string file = BrowseFileHandler ("images.sh", _("Path to images.sh File")); + if (file != nil) + { + if (FileUtils::Exists (file)) + { + string imagessh = (string) SCR::Read (.target.string, file); + if (imagessh != nil) + { + UI::ChangeWidget (`id ("images.sh"), `Value, imagessh); + StoreDescription ("images.sh", event); + } + } + } + return nil; + } + + // generic popup + define symbol NotImplementedHandler (string key, map event) { + if (event["ID"]:nil == key) + { + Popup::Message (_("Feature not implemented yet.")); + } + return nil; + } + + /** + * handler for main action: create the iso image with kiwi + */ + define boolean CreateImage (string key, map event) { + if (event["ID"]:nil != `next) + return true; + + map question = $[ + // popup question + "iso" : _("Create ISO image now?"), + // popup question + "xen" : _("Create Xen image now?"), + // popup question + "usb" : _("Create USB stick image now?"), + // popup question + "vmx" : _("Create virtual disk image now?"), + ]; + + map success = $[ + // popup message, %1 is a dir + "iso" : _("ISO image successfully created in +%1 +directory."), + // popup message, %1 is a dir + "xen" : _("Xen image files successfully created in +%1 +directory. +"), + // popup message, %1 is a dir + "usb" : _("USB stick image successfully created in +%1 +directory."), + // popup message, %1 is a dir + "vmx" : _("Virtual disk image successfully created in +%1 +directory."), + ]; + + Kiwi::WriteConfigXML (KiwiConfig, kiwi_task); + // default question + if (Popup::YesNo (question[kiwi_task]:_("Create image now?"))) + { + if (true) + { + string out_dir = KiwiConfig["iso-directory"]:""; + if (FileUtils::CheckAndCreatePath (out_dir) && Kiwi::PrepareAndCreate (out_dir)) + { + if (kiwi_task == "usb" && false) + { + // additional question (yes/no) + if (Popup::YesNo (sformat (success[kiwi_task]:"", out_dir) + _(" +Save the image to the stick now?"))) + { + NotImplementedHandler ("", $[ "ID" : ""]); + } + } + else + { + // default popup message, %1 is a dir + Popup::Message (sformat (success[kiwi_task]:_("Image successfully created in +%1 +directory."), out_dir)); + } + } + } + } + string dir = Kiwi::SaveConfiguration (KiwiConfig, kiwi_task); + if (dir != nil && dir != "") + { + ProductCreator::Config["kiwi_configuration_" + kiwi_task] = dir; + } + return true; + } + + /** + * Global init function for Kiwi image dialog + * - read saved settings and fill in defaults + */ + define void InitImageConfiguration () { + + kiwi_task = Kiwi::kiwi_task; + string kiwi_dir = "/usr/share/kiwi/image/"; + + // read the information from the base product + integer src_id = ProductCreator::checkProductDependency (); + map content = ProductCreator::ReadContentFile(src_id); + + KiwiConfig = ProductCreator::Config; + // busy popup + Popup::ShowFeedback (_("Reading current image configuration..."), _("Please wait...")); + + map default_dirmap = $[ + "iso" : sformat ("%1/kwliveDVD-suse-10.3", kiwi_dir), + "xen" : sformat ("%1/buildhost-suse-SLES10", kiwi_dir), + "usb" : sformat ("%1/kwliveDVD-suse-10.3", kiwi_dir), + "vmx" : sformat ("%1/kwliveDVD-suse-10.3", kiwi_dir), + ]; + + // path to current config directory + string default_dir = default_dirmap[kiwi_task]:""; + string kiwi_configuration = KiwiConfig["kiwi_configuration_" + kiwi_task]:default_dir; + if (!FileUtils::Exists (kiwi_configuration)) + { + // use local template if default dir does not exist (bug #289552) + if (!FileUtils::Exists (default_dir)) + { + default_dir = Directory::datadir+"/product-creator/kiwi_templates/"; + default_dir = default_dir + (kiwi_task == "xen" ? "xen" : "iso"); + } + y2warning ("directory %1 is not available, using %2", kiwi_configuration, default_dir); + kiwi_configuration = default_dir; + } + + if (FileUtils::Exists (kiwi_configuration + "/root")) + { + // read all entries from root_dir and save to list + map out = (map) SCR::Execute (.target.bash_output, + sformat ("ls -A1 -d %1/root/* 2>/dev/null", kiwi_configuration)); + KiwiConfig["root_dir"] = filter (string f, splitstring(out["stdout"]:"", "\n"), ``(f!="")); + } + if (FileUtils::Exists (kiwi_configuration + "/config")) + { + map out = (map) SCR::Execute (.target.bash_output, + sformat ("ls -A1 -d %1/config/* 2>/dev/null", kiwi_configuration)); + KiwiConfig["config_dir"] = filter (string f, splitstring(out["stdout"]:"", "\n"),``(f!="")); + } + + foreach (string file, [ "images.sh", "config.sh" ], { + string file_path = kiwi_configuration + "/" + file; + if (FileUtils::Exists (file_path)) + { + string contents = (string) SCR::Read (.target.string, file_path); + if (contents != nil) + KiwiConfig[file] = contents; + } + }); + + map read_config = Kiwi::ReadConfigXML (kiwi_configuration); + if (!KiwiConfig["_imported"]:false) + { + KiwiConfig = (map) union (KiwiConfig, read_config); + // for new configuration, do not read all from the template + y2milestone ("product-creator based configuration..."); + foreach (string key, ["addons", "packages", "sources"], { + KiwiConfig[key] = ProductCreator::Config[key]:[]; + }); + } + else + { + y2milestone ("imported configuration..."); + // ignore options already set earlier... + foreach (string key, any val, read_config, { + if (!contains (["name", "iso-directory", "sources", "version"],key)) + { + KiwiConfig[key] = val; + } + }); + // "sources" are already there... + foreach (string key, ["addons", "packages"], { + ProductCreator::Config[key] = KiwiConfig[key]:[]; + }); + } + + map label2boot = $[ + "openSUSE 10.2" : "suse-10.2", + "openSUSE 10.3" : "suse-10.3", + "SUSE Linux 10.1" : "suse-10.1", + "SUSE Linux Enterprise Server 10" : "suse-SLES10", + "SUSE Linux Enterprise Desktop 10" : "suse-SLED10" + ]; + map distproduct2boot = $[ + "openSUSE-10.2-CD-download" : "suse-10.2", + "openSUSE-10.2-dvd5-download" : "suse-10.2", + "openSUSE-10.3-dvd5-download" : "suse-10.3", + "openSUSE-10.3-CD-download" : "suse-10.3", + "SUSE-Linux-10.1-CD-download-x86" : "suse-10.1", + "SUSE-Linux-Enterprise-Server-i386" : "suse-SLES10", + "SUSE-Linux-Enterprise-Desktop-i386" : "suse-SLED10", + "SUSE-Linux-Enterprise-Server-SP1" : "suse-SLES10-SP1", + "SUSE-Linux-Enterprise-Desktop-SP1" : "suse-SLED10-SP1" + ]; + string boot_image = label2boot[content["LABEL"]:""]:""; + if (boot_image == "") + boot_image = distproduct2boot[content["DISTPRODUCT"]:""]:""; + + // guess some default boot image value + if (kiwi_task == "iso" && !haskey (KiwiConfig, "isoboot") && boot_image != "") + { + KiwiConfig["isoboot"] = boot_image; + } + else if (kiwi_task == "usb") + { + if (!haskey (KiwiConfig, "usbboot") && boot_image != "") + KiwiConfig["usbboot"] = boot_image; + } + else if (kiwi_task == "vmx") + { + if (!haskey (KiwiConfig, "vmxboot") && boot_image != "") + KiwiConfig["vmxboot"] = boot_image; + } + else if (kiwi_task == "xen") + { + if (!haskey (KiwiConfig, "xenboot")) + KiwiConfig["xenboot"] = boot_image; + } + string name = KiwiConfig["name"]:""; + if (!haskey (KiwiConfig, "specification")) + KiwiConfig["specification"] = KiwiConfig["name"]:""; + Popup::ClearFeedback (); + } + + + /******************************************************************************************** + * widget descriptions + *******************************************************************************************/ + + // return map with description of tabs + // it is a function, to be able to adapt to actual state (e.g. boot_image_widget ()) + map tabs_descr () { + + return $[ + "config.xml" : $[ + // tab header + "header" : _("Image Configuration"), + "contents" : `HBox (`HSpacing(1), + `VBox ( + `VSpacing (0.2), + `HBox ( + `HWeight (1, "version"), + `HWeight (1, `HBox ("size", "sizeunit")) + ), + "sw_selection", + `HBox ( + `HWeight (1, `VBox ( + `Left (`Label (_("Installed Software"))), "rt_sw", `Right ("configure_sw") + )), + `HWeight (1, `VBox ("ignore", "delete_sw")) + ), + `VSpacing (0.2) + ), `HSpacing(1)), + "widget_names" : [ + "version", + "size", "sizeunit", + "sw_selection", + "rt_sw", "configure_sw", + "ignore", "delete_sw" + ], + ], + "description" : $[ + // tab header + "header" : _("Description"), + "contents" : `HBox (`HSpacing(1), + `VBox ( + `VSpacing (0.2), + "author", + `VSpacing (0.2), + "contact", + `VSpacing (0.2), + "specification", + `VStretch () + ), `HSpacing (1)), + "widget_names" : [ "author", "contact", "specification" ], + ], + "users" : $[ + // tab header + "header" : _("Users"), + "contents" : `HBox (`HSpacing(1), + `VBox ( + "general_users", + `VSpacing (0.2), + "group", + `VSpacing (0.2), + "userstable", + `VSpacing (0.2), + `HBox ("adduser", "edituser", "deleteuser", `HStretch ()), + `VSpacing (0.2) + ), `HSpacing (1)), + "widget_names" : [ + "general_users", "group", "userstable", "adduser", "edituser", "deleteuser" + ] + ], + "scripts" : $[ + // tab header + "header" : _("Scripts"), + "contents" : `HBox (`HSpacing(1), + `VBox ( + "general_scripts", + `VSpacing (0.2), + `HBox ("config.sh", `Bottom ("import_config.sh")), + `HBox ("images.sh", `Bottom ("import_images.sh")), + `VSpacing (0.2) + ), `HSpacing (1)), + "widget_names" : [ + "general_scripts", + "config.sh", "import_config.sh", + "images.sh", "import_images.sh", + ], + ], + "directories" : $[ + // tab header + "header" : _("Directories"), + "contents" : `HBox (`HSpacing(1), + `VBox ( + "general_directories", + `VSpacing (0.2), + "root_dir_table", + `VSpacing (0.2), + `HBox ("root_dir_add", `Left ("root_dir_delete")), + `VSpacing (0.2), + "config_dir_table", + `VSpacing (0.2), + `HBox ("config_dir_add", `Left ("config_dir_delete")), + `VSpacing (0.2), + `VSpacing (0.2) + ), `HSpacing (1)), + "widget_names" : [ + "general_directories", + "root_dir_table", "root_dir_add", "root_dir_delete", + "config_dir_table", "config_dir_add", "config_dir_delete", + ], + ], + ]; + } + + map get_widget_description () { + return $[ + // global widgets + "global" :$[ + "widget" : `empty, + "validate_type" : `function, + "validate_function" : CreateImage, + "no_help" : true, + ], + // widgets for config.xml tab + /* + "isoboot" : $[ + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + // combo box label + "label" : _("C&D Boot Image"), + // help text for "C&D Boot Image", %1/%2 is path (on extra line) + "help" : sformat (_("<p>Choose one <b>CD Boot Image</b> from the<br> +<tt>%1/%2</tt><br> +directory.</p> +"), + Kiwi::kiwi_dir, boot_image_widget ()), + "items" : [], + "init" : InitBootCombo, + "store" : StoreBootCombo, + "handle" : HandleBootCombo, + ], + "xenboot" : $[ + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + // combo box label + "label" : _("&Xen Boot Image"), + // help text for "XEN Boot Image" + "help" : sformat (_("<p>Choose one <b>Xen Boot Image</b> from the<br> +<tt>%1/%2</tt><br> +directory.</p> +"), + Kiwi::kiwi_dir, boot_image_widget ()), + "items" : [], + "init" : InitBootCombo, + "store" : StoreBootCombo, + "handle" : HandleBootCombo, + ], + "usbboot" : $[ + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + // combo box label + "label" : _("&USB Stick Boot Image"), + // help text for "XEN Boot Image" + "help" : sformat (_("<p>Choose one <b>USB stick Boot Image</b> from the<br> +<tt>%1/%2</tt><br> +directory.</p> +"), + Kiwi::kiwi_dir, boot_image_widget ()), + "items" : [], + "init" : InitBootCombo, + "store" : StoreBootCombo, + "handle" : HandleBootCombo, + ], + "vmxboot" : $[ + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + // combo box label + "label" : _("&Virtual Disk Boot Image"), + // help text for "XEN Boot Image" + "help" : sformat (_("<p>Choose one <b>Virtual Disk Boot Image</b> from the<br> +<tt>%1/%2</tt><br> +directory.</p> +"), + Kiwi::kiwi_dir, boot_image_widget ()), + "items" : [], + "init" : InitBootCombo, + "store" : StoreBootCombo, + "handle" : HandleBootCombo, + ], + */ + "configure_boot" : $[ + "widget" : `push_button, + // pusbutton label + "label" : _("C&onfigure..."), + "help" : _("<p>Create a new boot image with <b>Configure</b>.</p>"), + "handle" : NotImplementedHandler + ], + "compressed" : $[ + "widget" : `checkbox, + // textentry label + "label" : _("Co&mpress"), + "help" : _("<p>Check <b>Compress</b> if the final image should be based \non the squashfs compressed file system."), + "init" : InitCompressCheckBox, + "store" : StoreCompressCheckBox, + "handle" : HandleCompressCheckBox, + ], + "sw_selection" : kiwi_task == "xen" ? $[ + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + // combo box label + "label" : _("So&ftware Selection"), + // help text for "So&ftware selection" + "help" : "", + "items" : [], + "init" : InitSWSelectionCombo, + "store" : StoreSWSelectionCombo, + "handle" : HandleSWSelectionCombo, + ] : $[ + "widget" : `empty, + "no_help" : true, + ], + "rt_sw" : $[ + "widget" : `richtext, + "init" : InitSWRichText, + "help" : "", + "label" : "&L", + ], + "configure_sw" : $[ + "widget" : `push_button, + // pusbutton label + "label" : _("Ch&ange..."), + "help" : _("<p>Adapt the software selection with <b>Change</b>.</p>"), + "handle" : HandleSWSelection + ], + "ignore" : $[ + "widget" : `multi_line_edit, + // label + "label" : _("&Ignored Software"), + "init" : InitSWIgnore, + "store" : StoreSWIgnore, + "handle" : HandleSWIgnore, + // help text for "&Ignored software" + "help" : _("<p>For <b>ignored software</b>, enter each entry (like 'smtp_daemon') on new line</p>"), + ], + "delete_sw" : $[ + "widget" : `multi_line_edit, + // label + "label" : _("Packages to &Delete"), + "init" : InitSWDelete, + "store" : StoreSWDelete, + "handle" : HandleSWDelete, + // help text for "&Ignored software" + "help" : _("<p>Each entry of <b>Packages to Delete</b> is one package name to be uninstalled from the target image.</p>"), + ], + "output_dir" : $[ + "widget" : `textentry, + // textentry label + "label" : _("O&utput Directory"), + "help" : _("help for output dir"), + "init" : InitOutputDir, + ], + "browse_output_dir" : $[ + "widget" : `push_button, + "label" : Label::BrowseButton (), + "help" : "", + "handle" : HandleBrowseOutputDirectory + ], + "version" : $[ + "widget" : `textentry, + // textentry label + "label" : _("&Version"), + "help" : _("<p>Enter the <b>Version</b> of your image configuration.</p>"), + "valid_chars" : String::CDigit () + ".", + "init" : InitVersion, + "store" : StoreVersion, + "handle" : HandleVersion, + ], + "size" : $[ + "widget" : `intfield, + "opt" : [ `hstretch ], + // textentry label + "label" : _("&Size"), + "help" : _("<p>Set the image <b>Size</b> in the specified <b>Unit</b>.</p>"), + "init" : InitSize, + "store" : StoreDescription, + "handle" : HandleDescription, + ], + "sizeunit" : $[ + "widget" : `combobox, + // textentry label + "label" : _("&Unit"), + "no_help" : true, + "items" : [], + "init" : InitSizeUnitCombo, + "store" : StoreDescription, + "handle" : HandleDescription, + ], + // ---------------- widgtes for directory structure + "general_scripts" : $[ + "widget" : `empty, + // general help for directory structure tab + "help" : _("<p>Here, edit the configuration scripts used to build your image.</p>"), + ], + "general_directories" : $[ + "widget" : `empty, + // general help for directory structure tab + "help" : _("<p>Here, point to the configuration directories that should help to build your image.</p>"), + ], + "root_dir" : $[ + "widget" : `textentry, + // textentry label + "label" : _("Directory with System Configur&ation"), + // help text + "help" : _("<p>Define the path to the <b>Directory with System Configuration</b> (the <tt>root</tt> directory). The entire directory is copied into the root of the image tree using <tt>cp -a</tt>.</p>"), + "init" : InitDescription, + "store" : StoreDescription, + "handle" : HandleDescription, + ], + "browse_root_dir" : $[ + "widget" : `push_button, + "label" : Label::BrowseButton (), + "help" : "", + "handle" : HandleBrowseRootDirectory + ], + "root_dir_table" : $[ + "widget" : `custom, + "custom_widget" : `VBox ( + // label (above table) + `Left (`Label (_("Directory with System Configuration"))), + `Table (`id("roottable"), `header ( + // table header + _("Path to Directory")) + ) + ), + // help for table with users + "help" : _("<p>Configure the <b>Directory with System Configuration</b> (the <tt>root</tt> directory). The entire directory is copied into the root of the image tree using <tt>cp -a</tt>.</p>"), + "init" : InitRootDirTable, + ], + "root_dir_add" : $[ + "widget" : `push_button, + "label" : Label::AddButton (), + "no_help" : true, + "handle" : HandleAddToRootDir, + ], + "root_dir_delete" : $[ + "widget" : `push_button, + "label" : Label::DeleteButton (), + "no_help" : true, + "handle" : HandleDeleteFromRootDir, + ], + "config_dir_table" : $[ + "widget" : `custom, + "custom_widget" : `VBox ( + // label (above table) + `Left (`Label (_("Directory with Scripts"))), + `Table (`id("configtable"), `header ( + // table header + _("Path to File")) + ) + ), + // help for table with users + "help" : _("<p>Configure the <b>Directory with Scripts</b> (the <tt>config</tt> directory). It contains scripts that are run after the installation of all the image packages.</p>"), + "init" : InitConfigDirTable, + ], + "config_dir_add" : $[ + "widget" : `push_button, + "label" : Label::AddButton (), + "no_help" : true, + "handle" : HandleAddToConfigDir, + ], + "config_dir_delete" : $[ + "widget" : `push_button, + "label" : Label::DeleteButton (), + "no_help" : true, + "handle" : HandleDeleteFromConfigDir, + ], + "config.sh" : $[ + "widget" : `multi_line_edit, + // textentry label + "label" : _("I&mage Configuration Script"), + "help" : _("<p>Edit your <b>Image Configuration Script</b>, called <tt>config.sh</tt>. This script is run at the end of the installation but before the package scripts have run.</p>"), + "init" : InitDescription, + "store" : StoreDescription, + "handle" : HandleDescription, + ], + "import_config.sh" : $[ + "widget" : `push_button, + // textentry label + "label" : _("&Import..."), + "help" : "", + "handle" : HandleImportConfigFile + ], + "config_dir" : $[ + "widget" : `textentry, + // textentry label + "label" : _("Pa&th to Directory with Scripts"), + "help" : _("<p>The optional <b>Directory with Scripts</b> (<tt>config</tt> directory) contains scripts that are run after the installation of all the image packages.</p>"), + "init" : InitDescription, + "store" : StoreDescription, + "handle" : HandleDescription, + ], + "browse_config_dir" : $[ + "widget" : `push_button, + // push button label + "label" : _("Br&owse..."), + "help" : "", + "handle" : HandleBrowseConfigDirectory + ], + "autoyast_path" : $[ + "widget" : `textentry, + // textentry label + "label" : _("Path to Auto&YaST Profile"), + "help" : _("Choose the path to the AutoYaST profile (config.xml)."), + ], + "browse_autoyast" : $[ + "widget" : `push_button, + // push button label + "label" : _("Brow&se..."), + "help" : "", + "handle" : HandleBrowseAutoYaSTFile + ], + "images.sh" : $[ + "widget" : `multi_line_edit, + // textentry label + "label" : _("C&leanup Script"), + "help" : _("<p>Edit your <b>Cleanup Script</b> (<tt>images.sh</tt>). This script is run at the beginning of the image creation process.</p>"), + "init" : InitDescription, + "store" : StoreDescription, + "handle" : HandleDescription, + ], + "import_images.sh" : $[ + "widget" : `push_button, + // textentry label + "label" : _("Im&port..."), + "help" : "", + "handle" : HandleImportImagesFile + ], + // ---------------- widgtes for description tab + "author" : $[ + "widget" : `textentry, + // textentry label + "label" : _("&Author"), + // help text for Author, Contact and Specification widgets + "help" : _("<p>Set the values for <b>Author</b> of the image, <b>Contact Information</b>, and the image <b>Specification</b>.</p>"), + "init" : InitDescription, + "store" : StoreDescription, + "handle" : HandleDescription, + ], + "contact" : $[ + "widget" : `textentry, + // textentry label + "label" : _("C&ontact"), + "init" : InitDescription, + "store" : StoreDescription, + "handle" : HandleDescription, + "no_help" : true, + ], + "specification" : $[ + "widget" : `multi_line_edit, + // textentry label + "label" : _("&Specification"), + "init" : InitDescription, + "store" : StoreDescription, + "handle" : HandleDescription, + "no_help" : true, + ], + // ---------------- widgtes for users tab + "general_users" : $[ + "widget" : `empty, + // general help for users tab + "help" : _("<p>Here, create users that should be available in the target system.</p>"), + ], + "group" : $[ + "widget" : `textentry, + // textentry label + "label" : _("&Group name"), + "help" : _("<p>Select the <b>Group Name</b> to which the users belong.</p>"), + "init" : InitDescription, + "store" : StoreDescription, + "handle" : HandleDescription, + ], + "userstable" : $[ + "widget" : `custom, + "custom_widget" : `Table (`id("table"), `opt (`notify), `header( + // table header + _("Name"), + // table header + _("Home Directory"))), + // help for table with users + "help" : _("<p>For each user, specify <b>Name</b>, <b>Password</b>, and <b>Home Directory</b>.</p>"), + "init" : InitUsersTable, + "handle" : HandleAddEditUser, + ], + "adduser" : $[ + "widget" : `push_button, + "label" : Label::AddButton (), + "no_help" : true, + "handle" : HandleAddEditUser, + ], + "edituser" : $[ + "widget" : `push_button, + "label" : Label::EditButton (), + "no_help" : true, + "handle" : HandleAddEditUser, + ], + "deleteuser" : $[ + "widget" : `push_button, + "label" : Label::DeleteButton (), + "no_help" : true, + "handle" : HandleDeleteUser, + ], + // ------------------ + ]; + } + + /** + * Main dialog for Kiwi image configuration + */ +define symbol KiwiDialog () { + +InitImageConfiguration (); + +map widget_descr = get_widget_description (); +widget_descr["tab"] = CWMTab::CreateWidget($[ + "tab_order" : [ + "config.xml", "description", "users", "scripts", "directories" + ], + "tabs" : tabs_descr (), + "widget_descr" : widget_descr, + "initial_tab" : "config.xml", +]); +Wizard::SetContentsButtons("", `VBox (), "", Label::BackButton(), Label::NextButton()); +term contents = `VBox ( + `Left (`Label (KiwiConfig["name"]:"")), + "tab", + `VSpacing (0.3), + "global" +); + +map caption = $[ + // dialog caption + "iso" : _("Live CD Configuration"), + // dialog caption + "xen" : _("Xen Image Configuration"), + // dialog caption + "usb" : _("USB Stick Image Configuration"), + // button label + "vmx" : _("Virtual Disk Image"), +]; +map next_button = $[ + // button label + "iso" : _("&Create ISO"), + // button label + "xen" : _("&Create Xen Image"), + // button label + "usb" : _("&Create USB Stick Image"), + // button label + "vmx" : _("&Create Virtual Disk Image"), +]; +symbol ret = CWM::ShowAndRun ($[ + "widget_names" : [ "global", "tab" ], + "widget_descr" : widget_descr, + "contents" : contents, + // default dialog caption + "caption" : caption[kiwi_task]:_("Image Configuration"), + "back_button" : Label::BackButton (), +// "next_button" : next_button[kiwi_task]:Label::NextButton (), + "next_button" : Label::FinishButton (), + "fallback_functions" : $[ + `abort : ProductCreator::ReallyAbort + ], +]); +y2milestone("Returning %1", ret); +return ret; +} + + /** + * Prepare dialog: define kiwi data without product-creator + */ + define symbol PrepareDialog () { + + kiwi_task = Kiwi::kiwi_task; + if (kiwi_task == "") + kiwi_task = "iso"; + + map Config = ProductCreator::Config; + string kiwi_configuration = Config["kiwi_configuration_" + kiwi_task]:""; + string name = Config["name"]:""; + string out_dir = Config["iso-directory"]:""; +// map repositories = Kiwi::current_repositories; + map repositories = Kiwi::current_repositories; + boolean new_configuration = (Config == $[]); + + string help = (new_configuration ? + // help text for kiwi UI preparation + _("<p>Enter the name of your image configuration. Base new configuration on template from the list or on the directory with the existing configuration.</p>") + : "") + + + // help text for kiwi UI preparation + (new_configuration ? sformat (_("<p>For information about configuration templates, see <tt>%1</tt> file.</p>"), Directory::vardir + "/product-creator/image_templates") : "") + + + // help text for kiwi UI preparation, cont. + _("<p>Choose the <b>Image Type</b> which should be created.</p>") + + + // help text for kiwi UI preparation, cont. + _("<p>Select <b>Output Directory</b> for the created image.</p>") + + + // help text for kiwi UI preparation, cont. + _("<p>Modify the list of <b>Package Repositories</b> that will be used for creating the image. If the list is empty, current system repositories will be used.</p>") + + + // help text for kiwi UI preparation, cont. + _("<p>Use <b>Next</b> to continue with the configuration.</p>"); + + list basic_type_items = [ + // combo box item + `item (`id ("iso"), _("Live ISO Image"), kiwi_task == "iso"), + // combo box item + `item (`id ("xen"), _("Xen Image"), kiwi_task == "xen"), + // combo box item + `item (`id ("usb"), _("USB Stick Image"), kiwi_task == "usb"), + // combo box item + `item (`id ("vmx"), _("Virtual Disk Image"), kiwi_task == "vmx") + ]; + map task2label = $[ + // combo box item + "pxe" : _("Network Boot Image") + ]; + + // on start, show the default YaST sources + if (Config == $[]) + { + /* - sources already initialized? FIXME not for kiwi.ycp + Pkg::SourceRestore (); + Pkg::SourceLoad(); + Config["sources"] = maplist (map source, Pkg::SourceEditGet (), { + integer srcid = source["SrcId"]:-1; + map data = Pkg::SourceGeneralData (srcid); + string url = data["url"]:""; + repositories[srcid] = url; + return url; + }); + */ + } + else if (Config["sources"]:[] != [] && repositories == $[]) + { + /* + list sources = Config["sources"]:[]; + list<map> all_sources = Pkg::SourceEditGet(); + foreach (map source, all_sources, { + integer srcid = source["SrcId"]:-1; + map data = Pkg::SourceGeneralData (srcid); + string url = data["url"]:""; + string stripped = url; + if (substring (url, 0, 6) == "dir://") + stripped = substring (url, 6); + if (contains(sources, url) || contains (sources, stripped)) + repositories[srcid] = url; + }); + */ + integer i = 0; + foreach (string src, Config["sources"]:[], { + repositories[i] = $[ + "url" : src, + ]; + i = i + 1; + }); + } + + void update_repo_table () { + UI::ChangeWidget (`id (`repositories), `Items, maplist ( + integer id, map repo, repositories, ``( + `item (`id (id), repo["url"]:"")) + )); + } + + // read the new configuration and update UI accordingly + // (no need to read config if it is provided as argument) + void update_config (string dir, map config) { + + kiwi_configuration = dir; + Config = + (config == $[] ? Kiwi::ReadConfigXML (kiwi_configuration) : config); + // busy popup + Popup::ShowFeedback (_("Importing repositories..."), _("Please wait...")); + repositories = Kiwi::ImportImageRepositories (Config); + Popup::ClearFeedback (); + if (!new_configuration) + { + name = Config["name"]:""; + UI::ChangeWidget (`id (`config), `Value, name); + } + else + { + Config["version"] = "1.0.0"; + } + if (Config["iso-directory"]:"" != "") + UI::ChangeWidget (`id (`out_dir), `Value, Config["iso-directory"]:""); + update_repo_table (); + list type_items = basic_type_items; + boolean primary = false; + foreach (string type, map data, Config["type"]:$[], { + if (!primary) + kiwi_task = type; + if (data["primary"]:"" == "true") + primary = true; + if (!contains (["iso", "xen", "usb", "vmx"], type)) + type_items = add (type_items, + `item (`id (kiwi_task), task2label[kiwi_task]:kiwi_task)); + }); + UI::ChangeWidget (`id (`type), `Items, type_items); + UI::ChangeWidget (`id (`type), `Value, kiwi_task); + } + + list template_items = maplist (string dir, map template, Kiwi::Templates, { + return `item (`id (dir), sformat ( + // combo box item, %1 is name, %2 version + _("%1, version %2"), template["name"]:"", template["version"]:"") + ); + }); + + list type_items = basic_type_items; + if (!contains (["iso", "xen", "usb", "vmx"], kiwi_task)) + type_items = add (type_items, + `item (`id (kiwi_task), task2label[kiwi_task]:kiwi_task, true)); + term contents = `VBox ( + new_configuration ? + `VBox ( + // text entry label + `TextEntry (`id (`config), _("&Kiwi configuration"), name), + `RadioButtonGroup (`id (`imp), `HBox (`HSpacing (), `VBox ( + `VSpacing (0.2), + `Left (`RadioButton (`id ("rb_new"), `opt (`notify), + // radio button label + _("Create from beginning"), true) + ), + template_items == [] ? `VSpacing (0) : + `Left (`RadioButton (`id ("rb_template"), `opt (`notify), + // radio button label + _("Base on Template")) + ), + `HBox ( + `HSpacing (2.5), + `ComboBox (`id (`template), `opt (`notify, `hstretch), "", + template_items) + ), + `Left (`RadioButton (`id ("rb_dir"), `opt (`notify), + // radio button label + _("Base on Existing Configuration")) + ), + `HBox ( + `HSpacing (2.5), + `Label (`id (`import_dir),`opt (`outputField,`hstretch),""), + // push button label + `PushButton (`id (`import), _("&Choose...")) + ) + ))) + ) : + `Left (`Label (`id (`config), name)), + // combo box label + `ComboBox (`id (`type), `opt (`notify, `hstretch), _("Image Type"), + type_items), + `HBox ( + // text entry label + `TextEntry (`id (`out_dir), _("&Output directory"), out_dir), + `VBox ( + `Label (""), + `PushButton (`id (`browse), Label::BrowseButton ()) + ) + ), + `VSpacing (0.2), + `Table (`id(`repositories), `header ( + // table header + _("Package Repository")) + ), + `HBox ( + `PushButton (`id (`add), Label::AddButton ()), + `PushButton (`id (`edit), Label::EditButton ()), + `PushButton (`id (`delete), Label::DeleteButton ()), + `HStretch () + ) + ); + // dialog caption + Wizard::SetContentsButtons (_("Image preparation"), contents, help, + Label::BackButton(), Label::NextButton()); + Wizard::RestoreBackButton(); + Wizard::RestoreAbortButton(); + + if (new_configuration && kiwi_configuration != "") + { + update_config (kiwi_configuration, $[]); + } + else + update_repo_table (); + + if (new_configuration) + { + UI::SetFocus (`id (`config)); + UI::ChangeWidget (`id (`template), `Enabled, false); + UI::ChangeWidget (`id (`import), `Enabled, false); + } + any ret = nil; + while (true) + { + ret = UI::UserInput(); + if (ret == `abort || ret == `cancel || ret == `back) + { + if(ProductCreator::ReallyAbort()) break; + else continue; + } + else if (ret == "rb_dir") + { + UI::ChangeWidget (`id (`template), `Enabled, false); + UI::ChangeWidget (`id (`import), `Enabled, true); + if (kiwi_configuration == "") + ret = `import; + } + else if (ret == "rb_template") + { + UI::ChangeWidget (`id (`template), `Enabled, true); + UI::ChangeWidget (`id (`import), `Enabled, false); + ret = `template; + } + else if (ret == "rb_new") + { + UI::ChangeWidget (`id (`template), `Enabled, false); + UI::ChangeWidget (`id (`import), `Enabled, false); + } + if (ret == `import) + { + string dir = UI::AskForExistingDirectory ( + kiwi_configuration== "" ? Kiwi::images_dir : kiwi_configuration, + // popup for file selection dialog + _("Directory to Import")); + if (dir!= nil) + { + UI::ChangeWidget (`id (`import_dir), `Value, dir); + update_config (dir, $[]); + } + } + else if (ret == `template) + { + string dir = (string) UI::QueryWidget (`id (`template), `Value); + update_config (dir, Kiwi::Templates[dir]:$[]); + } + else if (ret == `add) + { + Wizard::CreateDialog (); + string url = ""; + if (SourceDialogs::TypeDialog () == `next && + SourceDialogs::EditDialog () == `next) + { + url = SourceDialogs::GetURL (); + } + Wizard::CloseDialog (); + if (url != "") + { + boolean present = false; + /* + foreach (integer id, string repo, repositories, { + if (repo == url) + present = true; + }); + */ + foreach (integer id, map repo, repositories, { + if (repo["url"]:"" == url) + { + present = true; + break; + } + }); + if (present) break; + +// integer id = -1; + map parsed = URL::Parse(url); + if (parsed["scheme"]:"" == "pkg") + { + parsed["scheme"] = "dir"; + url = URL::Build (parsed); +// id = Pkg::SourceCreateType (url, "", "Plaindir"); + } + /* + else + id = Pkg::SourceCreate (url, ""); + + if (id != -1) + { + repositories[id] = url; + update_repo_table (); + } + */ + repositories[size (repositories)] = $[ + "url" : url, + "plaindir" : parsed["scheme"]:"" == "dir" + ]; + update_repo_table (); + } + } + else if (ret == `edit) + { + integer selected = (integer) + UI::QueryWidget (`id (`repositories), `CurrentItem); + /* + map generalData = Pkg::SourceGeneralData (selected); + string url = generalData["url"]:""; + */ + string url = repositories[selected,"url"]:""; + string selected_url = url; +// boolean plaindir = generalData["type"]:"YaST" == "Plaindir"; + boolean plaindir = repositories[selected,"plaindir"]:false; + // change schema if the source type is plaindir + // to show the right popup dialog + if (plaindir) + { + map parsed = URL::Parse(url); + parsed["scheme"] = "pkg"; + url = URL::Build (parsed); + } + url = SourceDialogs::EditPopup (url); + if (url == "" || url == nil || url == selected_url); + continue; + // remove current url + add new one +// Pkg::SourceDelete (selected); + repositories = remove (repositories, selected); +// integer id = -1; + map parsed = URL::Parse(url); + if (parsed["scheme"]:"" == "pkg") + { + parsed["scheme"] = "dir"; + url = URL::Build (parsed); +// id = Pkg::SourceCreateType (url, "", "Plaindir"); + } + /* + else + id = Pkg::SourceCreate (url, ""); + repositories[id] = url; + */ + repositories[size (repositories)] = $[ + "url" : url, + "plaindir" : parsed["scheme"]:"" == "dir" + ]; + update_repo_table (); + } + else if (ret == `delete) + { + integer selected = (integer) + UI::QueryWidget (`id (`repositories), `CurrentItem); +// Pkg::SourceDelete (selected); + repositories = remove (repositories, selected); + update_repo_table (); + } + else if (ret == `browse) + { + string dir = UI::AskForExistingDirectory ("", + // popup for file selection dialog + _("Path to the Output Directory")); + if (dir!= nil) + { + UI::ChangeWidget (`id (`out_dir), `Value, dir); + } + } + else if (ret == `next) + { + string name = (string) UI::QueryWidget (`id (`config), `Value); + if (new_configuration && + FileUtils::Exists (Kiwi::images_dir + "/" + name)) + { + // error popup + Popup::Error (sformat (_("Configuration with name \"%1\" already exists. +Choose a different one."), name)); + UI::SetFocus (`id (`config)); + continue; + } + out_dir = (string) UI::QueryWidget (`id (`out_dir), `Value); + if (out_dir == "") + { + // error popup + Popup::Error (_("Enter the path to the output directory.")); + UI::SetFocus (`id (`out_dir)); + continue; + } + kiwi_task = (string) UI::QueryWidget (`id (`type), `Value); + break; + } + } + string boot = Config["type",kiwi_task,"boot"]:""; + if (boot != "" && issubstring (boot, "/")) + { + string prefix = kiwi_task == "pxe" ? "net" : kiwi_task; + Config[prefix + "boot"] = substring (boot, search (boot, "/") + 1); + } + if (ret == `next) + { + Config["kiwi_configuration_" + kiwi_task] = kiwi_configuration; + Config["_imported"] = true; + Config["iso-directory"] = out_dir; + Config["name"] = UI::QueryWidget (`id (`config), `Value); + /* + Config["sources"] = maplist ( + integer id, string repo, repositories, ``(repo)); + */ + Config["sources"] = maplist ( + integer id, map repo, repositories, ``(repo["url"]:"")); + if (Config["sources"]:[] != []) + { + ProductCreator::enable_sources = false; + map current_sources = $[]; + // delete current repos, that won't be used in config + foreach (map source, Pkg::SourceEditGet (), { + integer srcid = source["SrcId"]:-1; + map data = Pkg::SourceGeneralData (srcid); + string url = data["url"]:""; + current_sources[url] = srcid; + }); + // initialize new repos now + foreach (integer id, map repo, repositories, { + string url = repo["url"]:""; + if (substring (url, 0, 1) == "/") + url = "dir://" + url; + if (haskey (current_sources, url)) + { + current_sources = remove (current_sources, url); + return; + } + if (repo["plaindir"]:false) + Pkg::SourceCreateType (url, "", "Plaindir"); + else + Pkg::SourceCreate (url, ""); + }); + foreach (string url, integer srcid, current_sources, { + Pkg::SourceDelete (srcid); + }); + Pkg::SourceLoad(); + } + else + { + // reenable original sources + Pkg::SourceRestore (); + Pkg::SourceLoad(); + } + ProductCreator::Config = Config; + Kiwi::kiwi_task = kiwi_task; + } + y2milestone("Returning %1", ret); + return (symbol) ret; + } +} Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp?rev=41019&r1=41018&r2=41019&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Fri Sep 21 14:52:14 2007 @@ -11,14 +11,16 @@ textdomain "product-creator"; +import "Kiwi"; import "Wizard"; import "Popup"; import "Package"; +import "PackageCallbacksInit"; import "Sequencer"; include "product-creator/complex.ycp"; include "product-creator/dialogs.ycp"; -include "product-creator/kiwi.ycp"; +include "product-creator/kiwi_dialogs.ycp"; /** @@ -135,12 +137,27 @@ } /** + * Initialize the list of current repositories (before any other handling): + * we need to know their id's so it is possible to delete them when new + * kiwi config is imported (and its repos should be added) + */ +symbol InitRepositories () { + + Kiwi::current_repositories = Kiwi::InitCurrentRepositories (); + // TODO general Read function... + Kiwi::ReadImageTemplates (); + return `next; +} + +/** */ define symbol KiwiSequence() ``{ map aliases = $[ "init_sources" : [ ``( InitSources () ), true ], "kiwi" : ``( KiwiDialog () ), "summary" : ``( CommitConfig() ), + + // FIXME check if it was only kiwi config... "write" : ``( WriteDialog() ), ]; @@ -148,6 +165,7 @@ "ws_start" : "init_sources", "init_sources" : $[ `next : "kiwi", + `prepare : "prepare" ], "kiwi": $[ `abort : `abort, @@ -164,6 +182,40 @@ return Sequencer::Run( aliases, sequence ); } +define symbol ImageCreatorSequence() { + + map aliases = $[ + "init_repositories" : [ ``( InitRepositories () ), true ], + "images_overview" : ``( ImagesOverviewDialog() ), + "kiwi_prepare" : ``( PrepareDialog() ), + "kiwi" : ``( KiwiDialog () ), + ]; + map sequence = $[ + "ws_start" : "init_repositories", + "init_repositories" : $[ + `next : "images_overview" + ], + "images_overview" : $[ + `abort : `abort, + `kiwi : "kiwi_prepare", + `next : `next, + ], + "kiwi_prepare" : $[ + `abort : `abort, + `next : "kiwi" + ], + "kiwi": $[ + `abort : `abort, + `next : "images_overview", + ], + ]; + + PackageCallbacksInit::InitPackageCallbacks(); + + symbol ret = Sequencer::Run(aliases, sequence); + return ret; +} + /** * Main workflow of the product-creator configuration * @return sequence result Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/yast2-product-creator.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/yast2-product-creator.spec.in?rev=41019&r1=41018&r2=41019&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/yast2-product-creator.spec.in (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/yast2-product-creator.spec.in Fri Sep 21 14:52:14 2007 @@ -2,6 +2,9 @@ @HEADER@ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-packager autoyast2-installation yast2-security + +PreReq: %fillup_prereq + Requires: yast2-packager autoyast2-installation yast2-security # GPG.ycp and GPGWidgets.ycp @@ -25,14 +28,19 @@ @CLEAN@ +%post +%{fillup_only -n product-creator} + %files %defattr(-,root,root) %dir @yncludedir@/product-creator @yncludedir@/product-creator/* @clientdir@/product-creator.ycp +@clientdir@/image-creator.ycp @moduledir@/*.ycp @moduledir@/*.ybc @desktopdir@/product-creator.desktop +@desktopdir@/image-creator.desktop @ybindir@/y2mkiso %doc @docdir@ %dir @ydatadir@/product-creator @@ -40,3 +48,4 @@ #%dir /etc/YaST2/product-creator @scrconfdir@/*.scr @agentdir@/ag_* +/var/adm/fillup-templates/sysconfig.product-creator -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org