- YaST Commits

[yast-commit] r38245 - /trunk/autoinstallation/src/clients/autoyast.ycp
by ug＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: ug Date: Fri Jun 1 15:47:26 2007 New Revision: 38245 URL: http://svn.opensuse.org/viewcvs/yast?rev=38245&view=rev Log: CLI fix Modified: trunk/autoinstallation/src/clients/autoyast.ycp Modified: trunk/autoinstallation/src/clients/autoyast.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/aut… ============================================================================== --- trunk/autoinstallation/src/clients/autoyast.ycp (original) +++ trunk/autoinstallation/src/clients/autoyast.ycp Fri Jun 1 15:47:26 2007 @@ -19,6 +19,7 @@ import "Popup"; import "AddOnProduct"; import "CommandLine"; + import "Y2ModuleConfig"; include "autoinstall/dialogs.ycp"; include "autoinstall/conftree.ycp"; @@ -45,6 +46,25 @@ control file and try again. ")); } + Popup::ShowFeedback(_("Reading configuration data"), _("This may take a while")); + foreach(string p, map d, Profile::ModuleMap, ``{ + /* Set resource name, if not using default value */ + string resource = d["X-SuSE-YaST-AutoInstResource"]:""; + if (resource == "") + { + resource = p; + } + y2debug("resource: %1", resource ); + string tomerge = d["X-SuSE-YaST-AutoInstMerge"]:""; + string module_auto =d["X-SuSE-YaST-AutoInstClient"]:"none"; + any rd = Y2ModuleConfig::getResourceData(d + ,resource); + if (rd!=nil) { + WFM::CallFunction(module_auto, ["Import", + rd]); + } + }); + Popup::ClearFeedback(); } -- 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] r38244 - in /trunk/autoinstallation: package/autoyast2.changes src/modules/AutoinstLVM.ycp
by ug＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: ug Date: Fri Jun 1 15:40:30 2007 New Revision: 38244 URL: http://svn.opensuse.org/viewcvs/yast?rev=38244&view=rev Log: fix for the reuse of LVM volumes Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstLVM.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri Jun 1 15:40:30 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jun 1 15:39:58 CEST 2007 - ug(a)suse.de + +- fix for the reuse of LVM volumes + +------------------------------------------------------------------- Tue May 29 16:32:15 CEST 2007 - ug(a)suse.de - added command line interface for opening files Modified: trunk/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstLVM.ycp Fri Jun 1 15:40:30 2007 @@ -33,6 +33,8 @@ global list<string> ExistingVGs = []; + global map<string, list<string> > keepLVM = $[]; + global map<string, list<string> > keepEVMS = $[]; // LVM map as imported from Profile global map<string, map> lvm = $[]; @@ -90,8 +92,35 @@ return (substring(d, 5) ); }); - y2milestone("Existing VGs: %1", ExistingVGs ); + /* look for VGs to reuse */ + foreach ( string k, map v, AutoinstStorage::AutoTargetMap, ``{ + foreach ( map p, v["partitions"]:[], ``{ + if( haskey( p, "lvm_group" ) && p["create"]:true == false ) { + keepLVM[p["lvm_group"]:"x"] = []; + if( !contains( ExistingVGs, p["lvm_group"]:"x" ) ) + Report::Error( sformat( _("can't reuse volume group %1. The volume group does not exist"), p["lvm_group"]:"x" ) ); + map atm = AutoinstStorage::AutoTargetMap; + foreach ( map vg_p, atm["/dev/"+p["lvm_group"]:"x","partitions"]:[], ``{ + if( vg_p["create"]:true == false ) + keepLVM[p["lvm_group"]:"x"] = add( keepLVM[p["lvm_group"]:"x"]:[], vg_p["lv_name"]:"" ); + }); + } else if( haskey( p, "evms_group" ) && p["create"]:true == false ) { + keepEVMS[p["evms_group"]:"x"] = []; + if( !contains( ExistingVGs, p["evms_group"]:"x" ) ) + Report::Error( sformat( _("can't reuse volume group %1. The volume group does not exist"), p["evms_group"]:"x" ) ); + map atm = AutoinstStorage::AutoTargetMap; + foreach ( map vg_p, atm["/dev/"+p["evms_group"]:"x","partitions"]:[], ``{ + if( vg_p["create"]:true == false ) + keepLVM[p["lvm_group"]:"x"] = add( keepLVM[p["evms_group"]:"x"]:[], vg_p["lv_name"]:"" ); + }); + } + }); + }); + + y2milestone("Existing VGs: %1", ExistingVGs); y2milestone("Existing LVM: %1", ExistingLVM); + y2milestone("keep LVM: %1", keepLVM); + y2milestone("keep EVMS: %1", keepEVMS); symbol dropType = ( vmType == `CT_LVM ? `CT_EVMS : `CT_LVM ); @@ -185,16 +214,26 @@ y2milestone("Existing LVs: %1", lvs); foreach(map lv, lvs, ``{ + /* if (!contains(lvm["/dev/"+vgname, "keep_lv"]:[], lv["name"]:"")) { removeLogicalVolume( "/dev/"+vgname, "/dev/"+vgname+"/"+lv["name"]:"" ); //FIXME: does removeLogicalVolume work for EVMS? } + */ + if (!contains(keepLVM[vgname]:[], lv["name"]:"")) { + removeLogicalVolume( "/dev/"+vgname, + "/dev/"+vgname+"/"+lv["name"]:"" ); //FIXME: does removeLogicalVolume work for EVMS? + } }); +/* if (size(lvm["/dev/"+vgname, "keep_lv"]:[]) == 0 && ExistingLVM["/dev/" +vgname]:$[] != $[]) { removeVolumeGroup( vgname ); //FIXME: does removeVolumeGroup work for EVMS? } + */ + if( ! haskey( keepLVM, vgname ) && ExistingLVM["/dev/" +vgname]:$[] != $[] ) + removeVolumeGroup( vgname ); //FIXME: does removeVolumeGroup work for EVMS? return true; } @@ -435,11 +474,15 @@ list<map> lvlist = ExistingLVM[device, "partitions"]:[]; - if (contains(volume_group["keep_lv"]:[], lv["nr"]:"_error_")) { +// if (contains(volume_group["keep_lv"]:[], lv["nr"]:"_error_")) { + if( contains(keepLVM[vgname]:[], lv["lv_name"]:"") ) { list<map> lvtokeep = filter(map p, lvlist, ``(p["nr"]:"" == lv["lv_name"]:"")); map this_lv = lvtokeep[0]:$[]; - y2milestone("Keeping LV: %1", this_lv); + y2milestone("Keeping LV: %1", this_lv); + y2milestone("lv = %1",lv); + + lv["device"] = "/dev/"+vgname+"/"+lv["lv_name"]:""; lv["used_fs"] = this_lv["used_fs"]:`reiser; -- 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] r38243 - in /trunk/kdump/src: Kdump.ycp dialogs.ycp uifunctions.ycp
by juhliarik＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: juhliarik Date: Fri Jun 1 15:14:24 2007 New Revision: 38243 URL: http://svn.opensuse.org/viewcvs/yast?rev=38243&view=rev Log: added handle function for starting kdump Modified: trunk/kdump/src/Kdump.ycp trunk/kdump/src/dialogs.ycp trunk/kdump/src/uifunctions.ycp Modified: trunk/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/Kdump.ycp?rev=38243&r1… ============================================================================== --- trunk/kdump/src/Kdump.ycp (original) +++ trunk/kdump/src/Kdump.ycp Fri Jun 1 15:14:24 2007 @@ -42,6 +42,7 @@ import "BootCommon"; import "Storage"; import "Map"; +import "Bootloader"; /** * Prototypes @@ -59,6 +60,7 @@ /** * List of available partiotions + * with known partition * * list <string> */ @@ -73,6 +75,14 @@ */ global list <string> uknown_fs_partitions =[]; +/** + * Boolean option indicates kernel parameter + * "crashkernel" + * + * boolean true if kernel parameter is set + */ +global boolean crashkernel_param = false; + /** * Write only, used during autoinstallation. @@ -207,6 +217,25 @@ /** * Read current kdump configuration * + * read kernel parameter "crashkernel" + * @return boolean successfull + */ + +boolean ReadKdumpKernelParam () { + + string result = Bootloader::getKernelParam (Bootloader::getDefaultSection (), "crashkernel"); + if (result == "true") { + crashkernel_param = true; + } else { + crashkernel_param = false; + } + return true; +} + + +/** + * Read current kdump configuration + * * @return boolean successfull */ boolean ReadKdumpSettings () { @@ -219,7 +248,7 @@ y2milestone("kdump configuration has been read: %1", KDUMP_SETTINGS); y2milestone("---------------------------------------------"); - + return true; } @@ -233,36 +262,49 @@ /* Kdump read dialog caption */ string caption = _("Initializing kdump Configuration"); - integer steps = 2; + integer steps = 3; sleep(sl); Progress::New( caption, " ", steps, [ - /* Progress stage 1/2 */ + /* Progress stage 1/3 */ _("Read the config file"), - /* Progress stage 2/2 */ + /* Progress stage 2/3 */ _("Read disk partitions"), + /* Progress stage 3/3 */ + _("Read kernel boot options"), ], [ - /* Progress step 1/2 */ + /* Progress step 1/3 */ _("Reading the config file..."), - /* Progress finished 2/2*/ - _("Finished") + /* Progress step 2/3*/ + _("Reading partitions of disks..."), + /* Progress finished 3/3*/ + Message::Finished() ], "" ); + sleep(sl); // read database if(Abort()) return false; Progress::NextStage(); /* Error message */ if(!ReadKdumpSettings ()) Report::Error(_("Cannot read config file /etc/sysconfig/kdump")); - sleep(sl); + //sleep(sl); // read another database if(Abort()) return false; Progress::NextStep(); /* Error message */ if(!ReadDiskPartitions ()) Report::Error(_("Cannot read disk partitions.")); - sleep(sl); + //sleep(sl); + + // read another database + if(Abort()) return false; + Progress::NextStep(); + /* Error message */ + if(!ReadKdumpKernelParam ()) Report::Error(_("Cannot read kernel boot options")); + //sleep(sl); + if(Abort()) return false; /* Progress finished */ Modified: trunk/kdump/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/dialogs.ycp?rev=38243&… ============================================================================== --- trunk/kdump/src/dialogs.ycp (original) +++ trunk/kdump/src/dialogs.ycp Fri Jun 1 15:14:24 2007 @@ -66,9 +66,9 @@ ["disable_kdump", _("&Disable kdump") ], ], "orientation" : `horizontal, - //"init" : - //"handle" : - //"store" : + "init" : InitEnableDisalbeKdump, + //"handle" : HandleEnableDisalbeKdump, + "store" : StoreEnableDisalbeKdump, "help" : HelpKdump("StartRadioBut"), ], Modified: trunk/kdump/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/uifunctions.ycp?rev=38… ============================================================================== --- trunk/kdump/src/uifunctions.ycp (original) +++ trunk/kdump/src/uifunctions.ycp Fri Jun 1 15:14:24 2007 @@ -35,19 +35,6 @@ */ -list local_partitions_list = [ - "/dev/sda2", - "/dev/sda5", - "/dev/sda7", -]; - - -list raw_partitions_list = [ - "/dev/sda2", - "/dev/sda5", - "/dev/sda7", -]; - boolean set_network = false; boolean set_kdump_append = false; @@ -133,8 +120,31 @@ ); +/** + * Function initializes option "Enable/Disable kdump" + */ +void InitEnableDisalbeKdump (string key) { + if (Kdump::crashkernel_param) { + UI::ChangeWidget(`id("EnableDisalbeKdump"),`Value,"enable_kdump"); + + } else { + UI::ChangeWidget(`id("EnableDisalbeKdump"),`Value,"disable_kdump"); + } +} +/** + * Function stores option "Enable/Disable kdump" + * + */ +void StoreEnableDisalbeKdump (string key, map event) { + string radiobut = (string) UI::QueryWidget(`id("EnableDisalbeKdump"), `Value); + if (radiobut == "enable_kdump") { + Kdump::crashkernel_param = true; + } else { + Kdump::crashkernel_param = false; + } +} /** -- 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] r38242 - /trunk/storage/agents-scr/etc_cryptotab.scr
by aschnell＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: aschnell Date: Fri Jun 1 12:57:55 2007 New Revision: 38242 URL: http://svn.opensuse.org/viewcvs/yast?rev=38242&view=rev Log: - fixed typos Modified: trunk/storage/agents-scr/etc_cryptotab.scr Modified: trunk/storage/agents-scr/etc_cryptotab.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/agents-scr/etc_cryptotab… ============================================================================== --- trunk/storage/agents-scr/etc_cryptotab.scr (original) +++ trunk/storage/agents-scr/etc_cryptotab.scr Fri Jun 1 12:57:55 2007 @@ -1,6 +1,6 @@ /** * File: - * etc_crytotab.scr + * etc_cryptotab.scr * Summary: * SCR Agent for reading/writing /etc/cryptotab * Access: @@ -11,7 +11,7 @@ * anyagent * man mount * Example: - * Original /etc/cypthotab: + * Original /etc/cryptotab: * /dev/loop0 /dev/hda3 /abuild reiserfs twofish noatime * /dev/loop1 /tmp/cryptfile /mnt ext2 twofish noatime * ... @@ -23,9 +23,9 @@ * ... * ]) * - * + * * (0) - * + * * $Id$ * */ -- 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] r38241 - /tags/stable-2_15_28/installation/
by mzugec＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: mzugec Date: Fri Jun 1 12:42:11 2007 New Revision: 38241 URL: http://svn.opensuse.org/viewcvs/yast?rev=38241&view=rev Log: Created tag stable-2_15_28 for installation Added: tags/stable-2_15_28/installation/ - copied from r38240, trunk/installation/ -- 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] r38240 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/network_finish.ycp yast2-installation.spec.in
by mzugec＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: mzugec Date: Fri Jun 1 12:42:06 2007 New Revision: 38240 URL: http://svn.opensuse.org/viewcvs/yast?rev=38240&view=rev Log: use shared isNetworkRunning() function in network_finish Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/network_finish.ycp trunk/installation/yast2-installation.spec.in Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=38240&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Fri Jun 1 12:42:06 2007 @@ -1 +1 @@ -2.15.27 +2.15.28 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Jun 1 12:42:06 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 1 12:41:10 CEST 2007 - mzugec(a)suse.cz + +- use shared isNetworkRunning() function in network_finish +- 2.15.28 + +------------------------------------------------------------------- Wed May 30 11:33:52 CEST 2007 - mzugec(a)suse.cz - fixed spec requirements Modified: trunk/installation/src/clients/network_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/network… ============================================================================== --- trunk/installation/src/clients/network_finish.ycp (original) +++ trunk/installation/src/clients/network_finish.ycp Fri Jun 1 12:42:06 2007 @@ -21,6 +21,7 @@ import "Arch"; import "Linuxrc"; import "String"; +import "NetworkService"; any ret = nil; string func = ""; @@ -50,9 +51,7 @@ { // if network running, write network configuration - map output = (map)SCR::Execute(.target.bash_output, - "([ $(ip addr|grep -v '127.0.0.1'|grep -c inet) != '0' ] && echo 'network') || echo 'no net'"); - if (issubstring(output["stdout"]:"", "network")) + if (NetworkService::isNetworkRunning()) { y2milestone("Save network configuration"); WFM::CallFunction ("save_network"); Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.… ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Fri Jun 1 12:42:06 2007 @@ -3,7 +3,7 @@ @HEADER@ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite yast2-country -BuildRequires: yast2 >= 2.15.22 +BuildRequires: yast2 >= 2.15.35 Requires: autoyast2-installation # WorkflowManager module, Installation::reboot_net_settings @@ -29,7 +29,8 @@ Conflicts: yast2-pkg-bindings < 2.13.101 # 'Product' and 'Installation' moved to 'yast2' -Conflicts: yast2 < 2.15.18 +# needs NetworkService::isNetworkRunning() from yast2 +Conflicts: yast2 < 2.15.35 # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) Requires: tar gzip -- 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] r38239 - /tags/branch-SLE-10-SP1-2_13_193/installation/
by locilka＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: locilka Date: Fri Jun 1 11:26:47 2007 New Revision: 38239 URL: http://svn.opensuse.org/viewcvs/yast?rev=38239&view=rev Log: Created tag branch-SLE-10-SP1-2_13_193 for installation Added: tags/branch-SLE-10-SP1-2_13_193/installation/ - copied from r38238, branches/SuSE-SLE-10-SP1-Branch/installation/ -- 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] r38238 - /tags/branch-SLE-10-SP1-2_13_193/
by locilka＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: locilka Date: Fri Jun 1 11:26:46 2007 New Revision: 38238 URL: http://svn.opensuse.org/viewcvs/yast?rev=38238&view=rev Log: Created tag branch-SLE-10-SP1-2_13_193 Added: tags/branch-SLE-10-SP1-2_13_193/ -- 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] r38237 - /tags/stable-2_15_39/network/
by mzugec＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: mzugec Date: Fri Jun 1 11:17:08 2007 New Revision: 38237 URL: http://svn.opensuse.org/viewcvs/yast?rev=38237&view=rev Log: Created tag stable-2_15_39 for network Added: tags/stable-2_15_39/network/ - copied from r38236, trunk/network/ -- 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] r38236 - /tags/stable-2_15_39/
by mzugec＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: mzugec Date: Fri Jun 1 11:17:07 2007 New Revision: 38236 URL: http://svn.opensuse.org/viewcvs/yast?rev=38236&view=rev Log: Created tag stable-2_15_39 Added: tags/stable-2_15_39/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0