May 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r57276 - /tags/branch-SLE-11-SP1-Stash-2_17_7/
by mzugec＠svn.opensuse.org 21 May '09

21 May '09

Author: mzugec Date: Thu May 21 09:31:00 2009 New Revision: 57276 URL: http://svn.opensuse.org/viewcvs/yast?rev=57276&view=rev Log: Created tag branch-SLE-11-SP1-Stash-2_17_7 Added: tags/branch-SLE-11-SP1-Stash-2_17_7/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57275 - in /branches/tmp/SLE-11-SP1-Stash/iscsi-server: VERSION package/yast2-iscsi-server.changes src/IscsiServer.ycp
by mzugec＠svn.opensuse.org 21 May '09

21 May '09

Author: mzugec Date: Thu May 21 09:30:51 2009 New Revision: 57275 URL: http://svn.opensuse.org/viewcvs/yast?rev=57275&view=rev Log: handle correctly when tgt is already installed (bnc#501375) Modified: branches/tmp/SLE-11-SP1-Stash/iscsi-server/VERSION branches/tmp/SLE-11-SP1-Stash/iscsi-server/package/yast2-iscsi-server.changes branches/tmp/SLE-11-SP1-Stash/iscsi-server/src/IscsiServer.ycp Modified: branches/tmp/SLE-11-SP1-Stash/iscsi-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/iscsi-se… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/iscsi-server/VERSION (original) +++ branches/tmp/SLE-11-SP1-Stash/iscsi-server/VERSION Thu May 21 09:30:51 2009 @@ -1 +1 @@ -2.17.6 +2.17.7 Modified: branches/tmp/SLE-11-SP1-Stash/iscsi-server/package/yast2-iscsi-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/iscsi-se… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/iscsi-server/package/yast2-iscsi-server.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/iscsi-server/package/yast2-iscsi-server.changes Thu May 21 09:30:51 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 21 09:19:02 CEST 2009 - mzugec(a)suse.cz + +- handle correctly when tgt is already installed (bnc#501375) +- 2.17.7 + +------------------------------------------------------------------- Mon Mar 23 17:51:33 CET 2009 - mzugec(a)suse.de - correctly work with firewall (bnc#462006) Modified: branches/tmp/SLE-11-SP1-Stash/iscsi-server/src/IscsiServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/iscsi-se… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/iscsi-server/src/IscsiServer.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/iscsi-server/src/IscsiServer.ycp Thu May 21 09:30:51 2009 @@ -27,6 +27,8 @@ import "IscsiServerFunctions"; import "Mode"; import "NetworkService"; +import "PackageSystem"; +import "Label"; boolean serviceStatus = false; boolean statusOnStart = false; @@ -125,15 +127,21 @@ // test if required package ("iscsitarget") is installed boolean installed_packages(){ - boolean ret = false; - y2milestone("Check if iscsitarget is installed"); - if( !Package::InstallMsg( "iscsitarget", - _("To configure the iSCSI target, the %1 package must be installed.") + - _("Install it now?")) ) - { - Popup::Error( Message::CannotContinueWithoutPackagesInstalled() ); - } else ret = true; - return ret; + if (!PackageSystem::PackageInstalled("iscsitarget")){ + y2milestone("Not installed, will install"); + boolean confirm = Popup::AnyQuestionRichText( + "", _("Can't continue without installing iscsitarget package"), 40, 10, + Label::InstallButton(), Label::CancelButton (), `focus_yes + ); + + if (confirm){ + if (PackageSystem::PackageInstalled("tgt")) PackageSystem::DoRemove(["tgt"]); + PackageSystem::DoInstall(["iscsitarget"]); + if (PackageSystem::PackageInstalled("iscsitarget")) return true; + else return false; + } + return false; + } else return true; } // check status of iscsitarget service -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57274 - in /trunk/iscsi-server: VERSION package/yast2-iscsi-server.changes src/IscsiServer.ycp
by mzugec＠svn.opensuse.org 21 May '09

21 May '09

Author: mzugec Date: Thu May 21 09:29:59 2009 New Revision: 57274 URL: http://svn.opensuse.org/viewcvs/yast?rev=57274&view=rev Log: handle correctly when tgt is already installed (bnc#501375) Modified: trunk/iscsi-server/VERSION trunk/iscsi-server/package/yast2-iscsi-server.changes trunk/iscsi-server/src/IscsiServer.ycp Modified: trunk/iscsi-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/VERSION?rev=57274&r… ============================================================================== --- trunk/iscsi-server/VERSION (original) +++ trunk/iscsi-server/VERSION Thu May 21 09:29:59 2009 @@ -1 +1 @@ -2.18.2 +2.18.3 Modified: trunk/iscsi-server/package/yast2-iscsi-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-server/package/yast2-iscsi-server.changes (original) +++ trunk/iscsi-server/package/yast2-iscsi-server.changes Thu May 21 09:29:59 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 21 09:19:51 CEST 2009 - mzugec(a)suse.cz + +- handle correctly when tgt is already installed (bnc#501375) +- 2.18.3 + +------------------------------------------------------------------- Mon Mar 9 15:42:14 CET 2009 - mzugec(a)suse.cz - correctly work with firewall (bnc#462006) Modified: trunk/iscsi-server/src/IscsiServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/src/IscsiServer.ycp… ============================================================================== --- trunk/iscsi-server/src/IscsiServer.ycp (original) +++ trunk/iscsi-server/src/IscsiServer.ycp Thu May 21 09:29:59 2009 @@ -27,6 +27,8 @@ import "IscsiServerFunctions"; import "Mode"; import "NetworkService"; +import "PackageSystem"; +import "Label"; boolean serviceStatus = false; boolean statusOnStart = false; @@ -125,15 +127,21 @@ // test if required package ("iscsitarget") is installed boolean installed_packages(){ - boolean ret = false; - y2milestone("Check if iscsitarget is installed"); - if( !Package::InstallMsg( "iscsitarget", - _("To configure the iSCSI target, the %1 package must be installed.") + - _("Install it now?")) ) - { - Popup::Error( Message::CannotContinueWithoutPackagesInstalled() ); - } else ret = true; - return ret; + if (!PackageSystem::PackageInstalled("iscsitarget")){ + y2milestone("Not installed, will install"); + boolean confirm = Popup::AnyQuestionRichText( + "", _("Can't continue without installing iscsitarget package"), 40, 10, + Label::InstallButton(), Label::CancelButton (), `focus_yes + ); + + if (confirm){ + if (PackageSystem::PackageInstalled("tgt")) PackageSystem::DoRemove(["tgt"]); + PackageSystem::DoInstall(["iscsitarget"]); + if (PackageSystem::PackageInstalled("iscsitarget")) return true; + else return false; + } + return false; + } else return true; } // check status of iscsitarget service -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57273 - /tags/branch-Code-11-2_17_18/product-creator/
by jsuchome＠svn.opensuse.org 20 May '09

20 May '09

Author: jsuchome Date: Thu May 21 00:09:41 2009 New Revision: 57273 URL: http://svn.opensuse.org/viewcvs/yast?rev=57273&view=rev Log: Created tag branch-Code-11-2_17_18 for product-creator Added: tags/branch-Code-11-2_17_18/product-creator/ - copied from r57272, branches/SuSE-Code-11-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57272 - in /branches/SuSE-Code-11-Branch/product-creator: ./ package/ src/ src/data/ src/data/kiwi_templates/iso/
by jsuchome＠svn.opensuse.org 20 May '09

20 May '09

Author: jsuchome Date: Thu May 21 00:09:35 2009 New Revision: 57272 URL: http://svn.opensuse.org/viewcvs/yast?rev=57272&view=rev Log: - added openssl-certs to default bootstrap section, so Update repos can work (bnc#491475) - look primary into base product for isolinux.cfg (bnc#496263) - read the configured architecture with GetArch, which merges i586 and i686 to i386 (bnc#464727) - 2.17.18 Modified: branches/SuSE-Code-11-Branch/product-creator/MAINTAINER branches/SuSE-Code-11-Branch/product-creator/VERSION branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp branches/SuSE-Code-11-Branch/product-creator/src/data/kiwi_templates/iso/config.xml branches/SuSE-Code-11-Branch/product-creator/src/data/sysconfig.product-creator branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-Code-11-Branch/product-creator/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/MAINTAINER (original) +++ branches/SuSE-Code-11-Branch/product-creator/MAINTAINER Thu May 21 00:09:35 2009 @@ -1 +1 @@ -Ladislav Slezak <lslezak(a)suse.cz> +Jiri Suchomel <jsuchome(a)suse.cz> Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-Branch/product-creator/VERSION Thu May 21 00:09:35 2009 @@ -1 +1 @@ -2.17.17 +2.17.18 Modified: branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes Thu May 21 00:09:35 2009 @@ -1,4 +1,53 @@ ------------------------------------------------------------------- +Wed May 20 23:21:19 CEST 2009 - jsuchome(a)suse.cz + +- added openssl-certs to default bootstrap section, so Update repos + can work (bnc#491475) +- look primary into base product for isolinux.cfg (bnc#496263) +- read the configured architecture with GetArch, which merges + i586 and i686 to i386 (bnc#464727) +- 2.17.18 + +------------------------------------------------------------------- +Thu May 14 11:59:26 CEST 2009 - jsuchome(a)suse.cz + +- read the whole kiwi process output (bnc#488799) + +------------------------------------------------------------------- +Wed May 13 11:56:52 CEST 2009 - jsuchome(a)suse.cz + +- make content file optional (for empty repos, bnc#500527) + +------------------------------------------------------------------- +Wed May 6 11:15:17 CEST 2009 - jsuchome(a)suse.cz + +- correct check for configuration type and version in templates + (bnc#498439) +- during configuration, do not throw away target image desctination + (bnc#499489) + +------------------------------------------------------------------- +Tue Apr 7 11:38:45 CEST 2009 - jsuchome(a)suse.cz + +- updated sysconfig template (DEFAULT_IMAGE_ARCHITECTURE) + +------------------------------------------------------------------- +Thu Apr 2 14:33:57 CEST 2009 - jsuchome(a)suse.cz + +- added option to specify "additive" attribute to size (fate#305327) + +------------------------------------------------------------------- +Wed Mar 25 14:47:40 CET 2009 - jsuchome(a)suse.cz + +- detect and report conflicts in selected and deleted package lists + (fate#305254) + +------------------------------------------------------------------- +Thu Mar 19 10:47:18 CET 2009 - jsuchome(a)suse.cz + +- allow building i386 images on x86_64 system (fate#305327) + +------------------------------------------------------------------- Thu Mar 12 12:31:54 CET 2009 - jsuchome(a)suse.cz - escape URL of base product when saving to XML (bnc#482395) Modified: branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp Thu May 21 00:09:35 2009 @@ -11,12 +11,14 @@ textdomain "product-creator"; + import "Arch"; import "Directory"; import "FileUtils"; import "Label"; import "Message"; import "Package"; import "Popup"; + import "ProductCreator"; import "Progress"; import "Report"; import "Security"; @@ -42,6 +44,9 @@ // bug 331733 global string supported_boot_images = ""; + // target architecture of image (can be only i386 if different from current one) + global string image_architecture = ""; + // directories with user-made templated global list<string> templates_dirs = []; @@ -446,7 +451,10 @@ UI::ChangeWidget (`id(`errlog), `LastLine, err + "\n"); } - string cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --nocolor --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir); + string linux32 = ""; + if (Arch::architecture () == "x86_64" && ProductCreator::GetArch () == "i386") + linux32 = "linux32"; + string cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir, linux32); if (selected_profiles != "" && selected_profiles != nil) cmd = cmd + selected_profiles; @@ -462,6 +470,13 @@ if (SCR::Read(.process.running, id) != true) { update_output (); + // explicitely check the process buffer after exit (bnc#488799) + string buf = (string) SCR::Read (.process.read, id); + string err_buf = (string) SCR::Read (.process.read_stderr, id); + if (buf != nil && buf != "") + UI::ChangeWidget (`id(`log), `LastLine, buf + "\n"); + if (err_buf != nil && err_buf != "") + UI::ChangeWidget (`id(`errlog), `LastLine, err_buf + "\n"); integer status = (integer) SCR::Read (.process.status, id); if (status != 0) @@ -481,7 +496,8 @@ // now continue with creating UI::ChangeWidget (`id(`log), `LastLine, "\n"); - cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --nocolor --create %1 -d %2 --logfile terminal", chroot_dir, out_dir); + cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --create %1 -d %2 --logfile terminal", + chroot_dir, out_dir, linux32); y2milestone ("calling '%1'", cmd); // label UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image")))); @@ -618,10 +634,10 @@ if (config != nil && config != $[]) { string name = config["name"]:""; - string ver = config["version"]:""; - if (config["image_type"]:"" != "system") + string ver = get_preferences (config, "version", ""); + if (config["description",0,"type"]:"" != "system") y2warning ("%1 not a 'system' image type, skipping", name); - else if (name_version[name]:"" == ver) + else if (name_version[name]:nil == ver) y2warning ("template %1,%2 already imported", name, ver); else { @@ -647,6 +663,13 @@ (string) SCR::Read (.sysconfig.product-creator.SUPPORTED_BOOT_IMAGES); if (supported_boot_images == nil) supported_boot_images = ""; + string architecture = + (string) SCR::Read (.sysconfig.product-creator.DEFAULT_IMAGE_ARCHITECTURE); + if (architecture == "" || architecture == nil) + architecture = ProductCreator::GetArch (); + if (architecture != "x86_64") // all i[456]86 are i386... + architecture = "i386"; + image_architecture = architecture; return ReadImageTemplates (); } } Modified: branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp Thu May 21 00:09:35 2009 @@ -435,7 +435,8 @@ return content_cache[srcid]:$[]; } - string content = Pkg::SourceProvideFile(srcid, 1, "content"); + // make content file optional (for empty repos, bnc#500527) + string content = Pkg::SourceProvideOptionalFile(srcid, 1, "content"); map<string,string> contentmap = (map<string,string>)SCR::Read(.content_file, content); if (contentmap == nil) contentmap = $[]; @@ -695,13 +696,19 @@ if (arch == "s390_64") arch = "s390x"; bootconfig_path = sformat("boot/%1/loader/isolinux.cfg", arch); - list<integer> srcids = [checkProductDependency()]; + + list<integer> srcids = []; + // bnc#496263 + if (Config["base_repo"]:"" == "") + srcids = [checkProductDependency()]; + else + srcids = UrlToId ([Config["base_repo"]:""]); foreach(integer srcid, srcids, { y2milestone("Downloading %1 from source %2", bootconfig_path, srcid); bootconfig_path = Pkg::SourceProvideOptionalFile(srcids[0]:0, 1, bootconfig_path); - y2debug("bootconfig_path: %1", bootconfig_path); + y2debug ("bootconfig_path: %1", bootconfig_path); if (bootconfig_path == nil) { Modified: branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp Thu May 21 00:09:35 2009 @@ -64,7 +64,7 @@ // needed for creating kiwi images because kiwi cannot create cross-architecture images boolean SameArchitecture() { - string arch = ProductCreator::Config["arch"]:""; + string arch = ProductCreator::GetArch (); string sysarch = Arch::architecture(); // is the target architecture different than the machine architecture? @@ -257,10 +257,6 @@ y2error("unexpected retcode: %1", ret); continue; } - - if (ret == `kiwi) - { - } } return (symbol)ret; @@ -658,10 +654,15 @@ string name = config["name"]:d; // index by order, so we can handle more configs with same name Configurations[i] = config; + string unit = config["preferences",0,"size",0,"unit"]:"M"; + string i_size = get_preferences (config, "size", 0) + unit; + // with "additive", "size" has a different meaning + if (config["preferences",0,"size",0,"additive"]:"" == "true") + i_size = "+" + i_size; overview = add (overview, `item ( `id (i), name, get_preferences (config, "version", "1.0.0"), - get_preferences (config, "size", 0) + i_size )); i = i + 1; } Modified: branches/SuSE-Code-11-Branch/product-creator/src/data/kiwi_templates/iso/config.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/data/kiwi_templates/iso/config.xml (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/data/kiwi_templates/iso/config.xml Thu May 21 00:09:35 2009 @@ -30,6 +30,7 @@ <package name="glibc-locale"/> <package name="kernel-default"/> <package name="udev"/> + <package name="openssl-certs"/> </packages> <split> <temporary> Modified: branches/SuSE-Code-11-Branch/product-creator/src/data/sysconfig.product-creator URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/data/sysconfig.product-creator (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/data/sysconfig.product-creator Thu May 21 00:09:35 2009 @@ -30,3 +30,15 @@ # # SUPPORTED_BOOT_IMAGES="" + +## Path: System/Yast2/Product-creator +## Description: YaST2 Product Creator +## Type: string(template) +## Default: none +# +# Default (preselected) architecture to build taget images for. If not specified, +# the default is the architeture of the build machine. +# Currently it has only sense to set "i386" on x86_64 machines. +# +# +DEFAULT_IMAGE_ARCHITECTURE="" Modified: branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp Thu May 21 00:09:35 2009 @@ -9,6 +9,7 @@ { textdomain "product-creator"; + import "Arch"; import "CWM"; import "CWMTab"; import "Directory"; @@ -398,6 +399,14 @@ } /** + * initialize the value of 'additive' + */ + define void InitAdditiveCheckBox (string id) { + boolean additive = KiwiConfig["preferences",0,"size",0,"additive"]:"" == "true"; + UI::ChangeWidget (`id (id), `Value, additive); + } + + /** * initialize the value of version */ define void InitSize (string id) { @@ -412,7 +421,9 @@ define void StoreSize (string key, map event) { KiwiConfig["preferences",0,"size"] = [ $[ content_key : sformat ("%1", UI::QueryWidget(`id(key), `Value)), - "unit" : UI::QueryWidget (`id ("sizeunit"), `Value) + "unit" : UI::QueryWidget (`id ("sizeunit"), `Value), + "additive" : ((boolean) UI::QueryWidget (`id ("additive"), `Value)) + ? "true" : "false" ]]; } @@ -946,6 +957,47 @@ define boolean CreateImage (string key, map event) { if (event["ID"]:nil != `next) return true; + + // check the conflicts between packages selected and marked for deletion (fate#305254) + y2milestone ("checking list of selected packages..."); + map to_delete = $[]; + foreach (map pmap, KiwiConfig["packages"]:[], { + string type = pmap["type"]:""; + if (type == "delete") + { + to_delete = listmap (map pacmap, pmap["package"]:[], ``( + $[ pacmap["name"]:"" : true ]) + ); + } + }); + boolean conflicting = false; + if (size (to_delete) > 0) + { + foreach (map package, Pkg::ResolvableProperties("", `package, ""), { + if (conflicting) + break; + if (package["status"]:nil == `selected) + { + symbol transact_by = package["transact_by"]:`none; + string name = package["name"]:""; + if (transact_by == `solver || transact_by == `user) + { + if (haskey (to_delete, name)) + { + y2milestone ("packege %1 selected by %2 is present in the delete list", + name, transact_by); + conflicting = true; + } + } + } + }); + } + // yes/no popup + if (conflicting && !Popup::YesNo (_("Some of the packages that are selected for installation +are also included in the list for deletion. +Continue anyway?"))) + return false; + boolean ret = true; map question = $[ // popup question @@ -1201,6 +1253,14 @@ // FIXME check if boot directories match current product (-> enable building // for product different from installed one) } + else + { + // existing defaultdestination needs to be used as iso-dirctory as well + // (correct iso-directory was replaced on import (bnc#499489) + string dest = get_preferences (KiwiConfig, "defaultdestination", ""); + if (dest != "") + KiwiConfig["iso-directory"] = dest; + } boolean primary_included = false; string boot_dir = ""; // set the primary building target according to kiwi_task @@ -1305,7 +1365,11 @@ `VSpacing (0.2), `HBox ( `HWeight (2, `HBox ( - "version", "size", "sizeunit" + "version", "size", "sizeunit", + `VBox ( + `Label (""), + "additive" + ) )), `HWeight (1, "compression") ), @@ -1322,7 +1386,7 @@ ), `HSpacing(1)), "widget_names" : [ "version", - "size", "sizeunit", "compression", + "size", "sizeunit", "additive", "compression", "sw_selection", "rt_sw", "configure_sw", "delete_sw", @@ -1510,15 +1574,19 @@ ], "sizeunit" : $[ "widget" : `combobox, - // textentry label + // combo box label (MB/GB values) "label" : _("&Unit"), "no_help" : true, "items" : [], "init" : InitSizeUnitCombo, - /* - "store" : StoreGeneric, - "handle" : HandleGeneric, - */ + // stored and handled by "size" + ], + "additive" : $[ + "widget" : `checkbox, + // check box label + "label" : _("Additive"), + "no_help" : true,// FIXME the meaning of size is different...! + "init" : InitAdditiveCheckBox, ], // ---------------- widgtes for directory structure "general_scripts" : $[ @@ -2008,10 +2076,22 @@ 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"]:"") + _("%1, version %2"), template["name"]:"", get_preferences (template, "version", "")) ); }); + term arch_term = `VBox (); + + if (Arch::architecture () == "x86_64") + { + arch_term = `VBox ( + // checkbox label + `CheckBox (`id (`i386), `opt (`hstretch), _("&32bit Architecture Image"), + Kiwi::image_architecture == "i386"), + `VSpacing (0.2) + ); + } + term contents = `VBox ( new_configuration ? `VBox ( @@ -2061,6 +2141,7 @@ ) ), `VSpacing (0.2), + arch_term, `Table (`id(`repositories), `opt (`notify), `header ( // table header _("Package Repository")) @@ -2289,6 +2370,16 @@ list<string> failed_repositories = []; map<string,map> new_repositories = $[]; + + ProductCreator::ResetArch(); + + if (Arch::architecture () == "x86_64" && + UI::QueryWidget (`id (`i386), `Value) == true) + { + Kiwi::image_architecture = "i386"; + ProductCreator::SetPackageArch ("i386"); + } + if (size (repositories) > 0) { map<string,integer> current_sources = $[]; @@ -2305,8 +2396,12 @@ url = "dir://" + url; if (haskey (current_sources, url)) { +// integer srcid = current_sources[url]:-1; current_sources = remove (current_sources, url); return true; + // TODO is it correct to check architecture now? + // but why not to list repositories that won't be used... +// return CheckArchitecture (srcid); } integer source_ret = -1; string full_url = url; @@ -2321,7 +2416,13 @@ failed_repositories = add (failed_repositories, url); return false; } - else return true; + return true; + /* see above... + if (CheckArchitecture (source_ret)) + return true; + else + return false; + */ }); foreach (string url, integer srcid, current_sources, { Pkg::SourceDelete (srcid); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57271 - in /trunk/devtools: devtools/bin/create-new-package package/yast2-devtools.changes
by lslezak＠svn.opensuse.org 20 May '09

20 May '09

Author: lslezak Date: Wed May 20 17:24:33 2009 New Revision: 57271 URL: http://svn.opensuse.org/viewcvs/yast?rev=57271&view=rev Log: - create-new-package - fixed syntax error (missing semicolon) Modified: trunk/devtools/devtools/bin/create-new-package trunk/devtools/package/yast2-devtools.changes Modified: trunk/devtools/devtools/bin/create-new-package URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/create-new… ============================================================================== --- trunk/devtools/devtools/bin/create-new-package (original) +++ trunk/devtools/devtools/bin/create-new-package Wed May 20 17:24:33 2009 @@ -153,7 +153,7 @@ } print ("\n\n Your package '$new_name' was successfully created\n\n"); - print ("(To work with it, do not forget: cd $target_dir)\n\n") + print ("(To work with it, do not forget: cd $target_dir)\n\n"); print ("If you 'svn import' *before* building it, it will be easier.\n"); print ("After that, 'y2tool svnignore' will be useful\n"); } Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Wed May 20 17:24:33 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed May 20 17:23:49 CEST 2009 - lslezak(a)suse.cz + +- create-new-package - fixed syntax error (missing semicolon) + +------------------------------------------------------------------- Wed May 20 13:17:00 CEST 2009 - mvidner(a)suse.cz - y2tool tagversion: fixed branch tagging for tmp/* branches such as -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57270 - in /trunk/storage: libstorage/src/ package/ storage/src/include/ storage/src/modules/
by aschnell＠svn.opensuse.org 20 May '09

20 May '09

Author: aschnell Date: Wed May 20 15:23:59 2009 New Revision: 57270 URL: http://svn.opensuse.org/viewcvs/yast?rev=57270&view=rev Log: - removed usedByName from StorageInterface and "used_by" from target-map since superseded by usedByDevice and "used_by_device" Modified: trunk/storage/libstorage/src/Container.cc trunk/storage/libstorage/src/StorageInterface.h trunk/storage/libstorage/src/Volume.cc trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/lvm_pv_lib.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/libstorage/src/Container.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container… ============================================================================== --- trunk/storage/libstorage/src/Container.cc (original) +++ trunk/storage/libstorage/src/Container.cc Wed May 20 15:23:59 2009 @@ -287,7 +287,6 @@ info.name = name(); info.device = device(); info.usedByType = uby.type(); - info.usedByName = uby.name(); info.usedByDevice = uby.device(); info.readonly = readonly(); tinfo = info; Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Wed May 20 15:23:59 2009 @@ -192,7 +192,6 @@ string device; string name; UsedByType usedByType; - string usedByName; // deprecated string usedByDevice; bool readonly; }; @@ -274,7 +273,6 @@ string mount; MountByType mount_by; UsedByType usedByType; - string usedByName; // deprecated string usedByDevice; string fstab_options; string uuid; Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Wed May 20 15:23:59 2009 @@ -2710,7 +2710,6 @@ info.mount = mp; info.mount_by = mount_by; info.usedByType = uby.type(); - info.usedByName = uby.name(); info.usedByDevice = uby.device(); info.fstab_options = fstab_opt; info.uuid = uuid; Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed May 20 15:23:59 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 20 15:17:21 CEST 2009 - aschnell(a)suse.de + +- removed usedByName from StorageInterface and "used_by" from + target-map since superseded by usedByDevice and "used_by_device" + +------------------------------------------------------------------- Wed May 20 12:52:16 CEST 2009 - aschnell(a)suse.de - require newer version of yast2 base package (bnc #504429) Modified: trunk/storage/storage/src/include/lvm_pv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_pv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_pv_lib.ycp Wed May 20 15:23:59 2009 @@ -116,7 +116,6 @@ { p["used_by_type"] = devmap["used_by_type"]:`UB_NONE; p["used_by_device"] = devmap["used_by_device"]:""; - p["used_by"] = devmap["used_by"]:""; } parts = [ p ]; } Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed May 20 15:23:59 2009 @@ -1269,7 +1269,6 @@ if( t!=LibStorage::UB_NONE() ) { p["used_by_type"] = toSymbol( conv_usedby, t ); - p["used_by"] = LibStorage::VolumeInfo::swig_usedByName_get(vinfo); p["used_by_device"] = LibStorage::VolumeInfo::swig_usedByDevice_get(vinfo); } tmp = LibStorage::VolumeInfo::swig_fstab_options_get(vinfo); @@ -1601,7 +1600,7 @@ { list<string> l = [ "size_k", "cyl_size", "cyl_count", "label", "max_logical", "max_primary", "type", "readonly", - "used_by_type", "used_by", "used_by_device", "partitions", "dasdfmt", + "used_by_type", "used_by_device", "partitions", "dasdfmt", "udev_id", "udev_path" ]; foreach( string s, l, ``{ @@ -1629,7 +1628,6 @@ if( t!=LibStorage::UB_NONE() ) { c["used_by_type"] = toSymbol( conv_usedby, t ); - c["used_by"] = LibStorage::ContainerInfo::swig_usedByName_get(info); c["used_by_device"] = LibStorage::ContainerInfo::swig_usedByDevice_get(info); } boolean b = LibStorage::ContainerInfo::swig_readonly_get(info); Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Wed May 20 15:23:59 2009 @@ -3040,12 +3040,10 @@ }); y2milestone( "remove_vm removed:%1", tg[key]:$[] ); list<string> dl = tg[key,"devices"]:[]; - foreach( string d, dl, - ``{ - tg = Storage::DelPartitionData( tg, d, "used_by" ); + foreach( string d, dl, { tg = Storage::DelPartitionData( tg, d, "used_by_type" ); tg = Storage::DelPartitionData( tg, d, "used_by_device" ); - }); + }); } return( tg ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57269 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 20 May '09

20 May '09

Author: aschnell Date: Wed May 20 15:16:27 2009 New Revision: 57269 URL: http://svn.opensuse.org/viewcvs/yast?rev=57269&view=rev Log: - used used_by_device instead of used_by Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed May 20 15:16:27 2009 @@ -5321,11 +5321,11 @@ } if( partition["type"]:`unknown == `lvm ) { - string vgname = substring( partition["device"]:"", 5 ); - vgname = substring( vgname, 0, findfirstof( vgname, "/" )); + string vgdevice = substring( partition["device"]:"", 5 ); + vgdevice = "/dev/" + substring( vgdevice, 0, findfirstof( vgdevice, "/" )); list<string> mod = (list<string>) maplist(map k, filter(map e, tg["/dev/md","partitions"]:[], - ``(e["used_by"]:""==vgname) ), + ``(e["used_by_device"]:""==vgdevice) ), ``(k["raid_type"]:"")); y2milestone( "GetRootInitrdModules mod %1", mod ); foreach(string e, mod, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57268 - /tags/stable-2_18_8/bootloader/
by juhliarik＠svn.opensuse.org 20 May '09

20 May '09

Author: juhliarik Date: Wed May 20 14:35:15 2009 New Revision: 57268 URL: http://svn.opensuse.org/viewcvs/yast?rev=57268&view=rev Log: Created tag stable-2_18_8 for bootloader Added: tags/stable-2_18_8/bootloader/ (props changed) - copied from r57267, trunk/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57267 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes src/modules/BootCommon.ycp src/modules/BootSupportCheck.ycp src/routines/lilolike.ycp
by juhliarik＠svn.opensuse.org 20 May '09

20 May '09

Author: juhliarik Date: Wed May 20 14:35:05 2009 New Revision: 57267 URL: http://svn.opensuse.org/viewcvs/yast?rev=57267&view=rev Log: - fixed several issues for autoyast setting in bootloader - added support check for ext4 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/BootSupportCheck.ycp trunk/bootloader/src/routines/lilolike.ycp Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=57267&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Wed May 20 14:35:05 2009 @@ -1 +1 @@ -2.18.7 +2.18.8 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Wed May 20 14:35:05 2009 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Wed May 20 14:20:57 CEST 2009 - juhliarik(a)suse.cz + +- fixed additional options for memory test section (bnc#396150) +- fixed problems with empty settings in autoyast profile for + memory test section (bnc#390659) +- fixed problem with custom (disable) gfxmenu option in autoyast + profile (bnc#380509) +- fixed deleting gfxmenu option if there is defined serial console + (bnc#346576) +- added support check for ext4 (fate#305691) +- 2.18.8 + +------------------------------------------------------------------- Mon May 18 17:45:52 CEST 2009 - juhliarik(a)suse.cz - added fix for changing device map in y2-bootloader (bnc#497944) Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommo… ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Wed May 20 14:35:05 2009 @@ -709,6 +709,63 @@ y2error ("No generic propose function available"); } +/** bnc# 346576 - Bootloader configuration doesn't work for serial output + * Function check if settings need to remove gfxmenu + * + * @return boolean - true if gfxmenu needs to be removed + */ + +boolean removeGFXMenu () +{ + if ((globals["trusted_grub"]:"" == "true") && (haskey(globals, "gfxmenu"))) + { + y2milestone("Remove gfxmenu -> selected trusted grub"); + return true; + } + + if ((globals["serial"]:nil != "") && (globals["serial"]:nil != nil)) + { + y2milestone("Remove gfxmenu -> defined serial console"); + return true; + } + + if (globals["gfxmenu"]:"" == "none") + { + y2milestone("Remove gfxmenu -> disabled gfxmenu"); + return true; + } + return false; +} + +/** bnc #390659 - autoyast bootloader config: empty settings are ignored (memtest) + * + * Check if sections inlcude section for memtest + * if yes delete all unnecessary keys like initrd, vgamode, append... + */ +void checkMemtest () +{ + list<map<string,any> > out = []; + + foreach(map<string,any> s, sections, + { + if (search(s["image"]:"","memtest") != nil) + { + map<string,any> tmp_s = $[]; + tmp_s["image"] = s["image"]:""; + tmp_s["original_name"] = s["original_name"]:""; + tmp_s["name"] = s["name"]:""; + tmp_s["__changed"] = s["__changed"]:false; + tmp_s["__auto"] = s["__auto"]:false; + tmp_s["type"] = s["type"]:""; + y2milestone("Updating memtest section from: %1 to: %2", s, tmp_s); + out = add(out, tmp_s); + } else { + out = add(out, s); + } + }); + + sections = out; +} /** * Save all bootloader configuration files to the cache of the PlugLib * PlugLib must be initialized properly !!! @@ -735,6 +792,9 @@ if (bl == "none") return true; + if (removeGFXMenu()) + globals = remove(globals, "gfxmenu"); + // FIXME: give mountby information to perl-Bootloader (or define some // better interface), so that perl-Bootloader can use mountby device names // for these devices instead. Tracked in bug #248162. @@ -759,13 +819,15 @@ return $[BootStorage::Dev2MountByDev(k) : v]; }); y2milestone ("device map after mapping %1", my_device_mapping); - if ((globals["trusted_grub"]:"" == "true") && (haskey(globals, "gfxmenu"))) - globals = remove(globals, "gfxmenu"); + // convert XEN section to linux section id running in domU // bnc #436899 ConvertXENinDomU (); + // add check if there is memtest and delete from memtest section + // keys like append, initrd etc... + checkMemtest (); ret = ret && DefineMultipath(BootStorage::multipath_mapping); ret = ret && SetDeviceMap (my_device_mapping); ret = ret && SetSections (sections); Modified: trunk/bootloader/src/modules/BootSupportCheck.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootSuppo… ============================================================================== --- trunk/bootloader/src/modules/BootSupportCheck.ycp (original) +++ trunk/bootloader/src/modules/BootSupportCheck.ycp Wed May 20 14:35:05 2009 @@ -205,10 +205,11 @@ if ((tolower(p["fstype"]:"") == "md raid") && (BootCommon::globals["boot_mbr"]:"false" != "true")) { - result = false; AddNewProblem (_("The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record")); y2error("Booting from soft-raid: %1 and bootloader setting are not valid: %2", p, BootCommon::globals); + result = false; + break; } else { found_boot = true; y2milestone("Valid configuration for soft-raid"); @@ -219,7 +220,16 @@ y2milestone("The boot device: %1 is on raid: %2", boot_device, p["raid_type"]:""); } } + // check if /boot directory is on supported filesystem + // FATE#305691 -> Support ext4 as installation option + if (p["used_fs"]:nil == `ext4) + { + AddNewProblem (_("The /boot directory is on an ext4 filesystem. Create separate /boot partition with ext2 filesytem")); + y2error ("The /boot directory is on an ext4 filesystem"); + result = false; + break; + } if (p["used_fs"]:nil == `xfs) { AddNewProblem (_("The /boot directory is on an XFS filesystem. System may not boot.")); Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike… ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Wed May 20 14:35:05 2009 @@ -947,7 +947,11 @@ return UpdateDevice (d); }); BootCommon::globals["stage1_dev"] = mergestring (s1_devs, ","); - BootCommon::globals["gfxmenu"] = "/boot/message"; + + // bnc #380509 if autoyast profile includes gfxmenu == none + // it will be deleted + if (BootCommon::globals["gfxmenu"]:"" != "none") + BootCommon::globals["gfxmenu"] = "/boot/message"; // now that the label for the "linux" section is not "linux" anymore, but // some product dependent string that can change with an update ("SLES_10" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0