October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41602 - /tags/stable-2_16_3/product-creator/
by jsuchome＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: jsuchome Date: Mon Oct 29 11:25:50 2007 New Revision: 41602 URL: http://svn.opensuse.org/viewcvs/yast?rev=41602&view=rev Log: Created tag stable-2_16_3 for product-creator Added: tags/stable-2_16_3/product-creator/ - copied from r41601, trunk/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] r41601 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes yast2-product-creator.spec.in
by jsuchome＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: jsuchome Date: Mon Oct 29 11:25:46 2007 New Revision: 41601 URL: http://svn.opensuse.org/viewcvs/yast?rev=41601&view=rev Log: - package kernel-bigsmp has been renamed to kernel-pae - make a conflict with old yast2-storage - 2.16.3 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/yast2-product-creator.spec.in Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=4160… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Mon Oct 29 11:25:46 2007 @@ -1 +1 @@ -2.16.2 +2.16.3 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Mon Oct 29 11:25:46 2007 @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Mon Oct 29 09:23:40 CET 2007 - jsuchome(a)suse.cz +Mon Oct 29 11:13:16 CET 2007 - jsuchome(a)suse.cz - package kernel-bigsmp has been renamed to kernel-pae +- make a conflict with old yast2-storage +- 2.16.3 ------------------------------------------------------------------- Fri Oct 26 10:25:01 CEST 2007 - jsuchome(a)suse.cz Modified: trunk/product-creator/yast2-product-creator.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/yast2-product-cr… ============================================================================== --- trunk/product-creator/yast2-product-creator.spec.in (original) +++ trunk/product-creator/yast2-product-creator.spec.in Mon Oct 29 11:25:46 2007 @@ -11,6 +11,9 @@ Requires: yast2 >= 2.15.2 BuildRequires: yast2 >= 2.15.2 +# New API of StorageDevices.ycp +Conflicts: yast2-storage < 2.16.1 + BuildArchitectures: noarch Summary: Create a new product -- 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] r41600 - in /trunk/product-creator: package/yast2-product-creator.changes src/ProductCreator.ycp
by jsuchome＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: jsuchome Date: Mon Oct 29 09:24:00 2007 New Revision: 41600 URL: http://svn.opensuse.org/viewcvs/yast?rev=41600&view=rev Log: - package kernel-bigsmp has been renamed to kernel-pae Modified: trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/ProductCreator.ycp Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Mon Oct 29 09:24:00 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Oct 29 09:23:40 CET 2007 - jsuchome(a)suse.cz + +- package kernel-bigsmp has been renamed to kernel-pae + +------------------------------------------------------------------- Fri Oct 26 10:25:01 CEST 2007 - jsuchome(a)suse.cz - fix the sequence for going to kiwi image from main summary Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreat… ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Mon Oct 29 09:24:00 2007 @@ -1958,7 +1958,7 @@ if (kernel == "") { kernels = [ "kernel-64k-pagesize", - "kernel-bigsmp", + "kernel-pae", "kernel-debug", "kernel-default", "kernel-iseries64", -- 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] r41599 - in /trunk/gtk: ChangeLog src/YGProgressBar.cc tests/MultiProgressMeterVer.ycp
by rpmcruz＠svn.opensuse.org 26 Oct '07

26 Oct '07

Author: rpmcruz Date: Fri Oct 26 18:43:04 2007 New Revision: 41599 URL: http://svn.opensuse.org/viewcvs/yast?rev=41599&view=rev Log: * src/YGProgressBar.cc: improved look of the multi-progress-bar. Made it growing completely from bottom to top. * tests/MultiProgressMeterVer.ycp: test case. Added: trunk/gtk/tests/MultiProgressMeterVer.ycp Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGProgressBar.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41599&r1=41598… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Oct 26 18:43:04 2007 @@ -1,3 +1,10 @@ +2007-10-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGProgressBar.cc: improved look of the multi-progress-bar. Made + it growing completely from bottom to top. + + * tests/MultiProgressMeterVer.ycp: test case. + 2007-10-25 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygtkratiobox.h/c, YGProgressBar.cc, YGWidget.cc: bug Modified: trunk/gtk/src/YGProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGProgressBar.cc?rev=415… ============================================================================== --- trunk/gtk/src/YGProgressBar.cc (original) +++ trunk/gtk/src/YGProgressBar.cc Fri Oct 26 18:43:04 2007 @@ -121,10 +121,10 @@ // ygtk_ratio_box_set_homogeneous (YGTK_RATIO_BOX (getWidget()), TRUE); ygtk_ratio_box_set_spacing (YGTK_RATIO_BOX (getWidget()), 2); - for (int i = 0; i < segments(); i++) { + for (int i = segments()-1; i >= 0; i--) { GtkWidget* bar = gtk_progress_bar_new(); gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (bar), - horizontal ? GTK_PROGRESS_LEFT_TO_RIGHT : GTK_PROGRESS_BOTTOM_TO_TOP ); + horizontal ? GTK_PROGRESS_LEFT_TO_RIGHT : GTK_PROGRESS_BOTTOM_TO_TOP); // Progress bars just ask for too much size -- let's cut it const int min_size = 5; @@ -145,11 +145,12 @@ virtual void doUpdate() { GList* children = gtk_container_get_children (GTK_CONTAINER (getWidget())); - for (int i = 0; i < segments() && i < (signed)g_list_length (children); i++) { - GtkProgressBar *bar = GTK_PROGRESS_BAR (g_list_nth_data (children, i)); + int n = segments()-1; + for (GList *i = children; i && n >= 0; i = i->next, n--) { + GtkProgressBar *bar = GTK_PROGRESS_BAR (i->data); gfloat fraction = 0; - if (currentValue (i) != -1) - fraction = 1.0 - ((gfloat) currentValue(i) / maxValue(i)); + if (currentValue (n) != -1) + fraction = 1.0 - ((gfloat) currentValue(n) / maxValue(n)); gtk_progress_bar_set_fraction (bar, fraction); } g_list_free (children); Added: trunk/gtk/tests/MultiProgressMeterVer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/MultiProgressMeterVer.… ============================================================================== --- trunk/gtk/tests/MultiProgressMeterVer.ycp (added) +++ trunk/gtk/tests/MultiProgressMeterVer.ycp Fri Oct 26 18:43:04 2007 @@ -0,0 +1,39 @@ +// Simple example for MultiProgressMeter +{ + if ( ! UI::HasSpecialWidget(`HMultiProgressMeter ) ) + { + UI::OpenDialog( + `VBox( + `Label("Error: This UI doesn't support the MultiProgressMeter widget!"), + `PushButton(`opt(`default), "&OK") + ) + ); + UI::UserInput(); + UI::CloseDialog(); + + return; + } + + + UI::OpenDialog( + `VBox( + `VMultiProgressMeter(`id(`prog), [ 100, 200, 500, 20, 100 ] ), + `PushButton(`opt(`default), "&Ok" ) + ) + ); + + UI::ChangeWidget(`prog, `Values, [ 1000, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 800, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 500, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 200, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 200, 500, 20, 100 ] ); UI::UserInput(); + + UI::ChangeWidget(`prog, `Values, [ 0, 100, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 20, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 0, 500, 20, 100 ] ); UI::UserInput(); + + UI::ChangeWidget(`prog, `Values, [ 0, 0, 400, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 0, 300, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 0, 200, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 0, 100, 20, 100 ] ); UI::UserInput(); +} -- 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] r41598 - in /trunk/control-center: VERSION package/yast2-control-center.changes
by tgoettlicher＠svn.opensuse.org 26 Oct '07

26 Oct '07

Author: tgoettlicher Date: Fri Oct 26 15:52:43 2007 New Revision: 41598 URL: http://svn.opensuse.org/viewcvs/yast?rev=41598&view=rev Log: changes Modified: trunk/control-center/VERSION trunk/control-center/package/yast2-control-center.changes Modified: trunk/control-center/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION?rev=41598… ============================================================================== --- trunk/control-center/VERSION (original) +++ trunk/control-center/VERSION Fri Oct 26 15:52:43 2007 @@ -1 +1 @@ -2.15.6 +2.15.7 Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Fri Oct 26 15:52:43 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 26 15:48:39 CEST 2007 - tgoettlicher(a)suse.de + +- launch yast modules only when LMB is clicked (#332476) +- V 2.15.7 + +------------------------------------------------------------------- Wed Oct 24 14:16:28 CEST 2007 - tgoettlicher(a)suse.de - fixed YaST control center shows empty section (#309452) -- 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] r41597 - in /trunk/control-center/src: y2controlcenterview.cpp y2controlcenterview.h
by tgoettlicher＠svn.opensuse.org 26 Oct '07

26 Oct '07

Author: tgoettlicher Date: Fri Oct 26 15:51:13 2007 New Revision: 41597 URL: http://svn.opensuse.org/viewcvs/yast?rev=41597&view=rev Log: launch yast modules only when LMB is clicked (#332476) Modified: trunk/control-center/src/y2controlcenterview.cpp trunk/control-center/src/y2controlcenterview.h Modified: trunk/control-center/src/y2controlcenterview.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/y2controlcent… ============================================================================== --- trunk/control-center/src/y2controlcenterview.cpp (original) +++ trunk/control-center/src/y2controlcenterview.cpp Fri Oct 26 15:51:13 2007 @@ -118,11 +118,11 @@ _iconView->setItemTextPos( QIconView::Right ); _iconView->setSorting( false ); - connect( _iconView, SIGNAL( clicked ( QIconViewItem * ) ), - this, SLOT ( slotIconClicked ( QIconViewItem * ) ) ); + connect( _iconView, SIGNAL( mouseButtonClicked ( int, QIconViewItem *, const QPoint& ) ), + this, SLOT ( slotIconClicked ( int, QIconViewItem *, const QPoint&) )); - connect( _iconView, SIGNAL( returnPressed ( QIconViewItem * ) ), - this, SLOT ( slotIconClicked ( QIconViewItem * ) ) ); + connect( _iconView, SIGNAL( returnPressed ( QIconViewItem * ) ), + this, SLOT ( slotIconClicked ( QIconViewItem * ) )); connect( _iconView, SIGNAL( onItem ( QIconViewItem * ) ), this, SLOT ( slotOnItem ( QIconViewItem * ) ) ); @@ -419,6 +419,12 @@ runModule( ( (MyQIconViewItem *) item )->getModule() ); } +void Y2ControlCenterView::slotIconClicked(int button, QIconViewItem *item, const QPoint &pos) +{ + if ( item && button == Qt::LeftButton ) + runModule( ( (MyQIconViewItem *) item )->getModule() ); +} + void Y2ControlCenterView::runModule( const YMod *mod ) { Modified: trunk/control-center/src/y2controlcenterview.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/y2controlcent… ============================================================================== --- trunk/control-center/src/y2controlcenterview.h (original) +++ trunk/control-center/src/y2controlcenterview.h Fri Oct 26 15:51:13 2007 @@ -51,6 +51,7 @@ void slotResetCursor(); void slotSearchModule(QString text); void slotIconClicked(QIconViewItem *); + void slotIconClicked(int button, QIconViewItem *item, const QPoint &pos); void slotOnItem(QIconViewItem *); void slotAdjustListbox(); void errorPopup(QString msg); -- 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] r41596 - /tags/stable-2_16_5/network/
by mzugec＠svn.opensuse.org 26 Oct '07

26 Oct '07

Author: mzugec Date: Fri Oct 26 15:05:27 2007 New Revision: 41596 URL: http://svn.opensuse.org/viewcvs/yast?rev=41596&view=rev Log: Created tag stable-2_16_5 for network Added: tags/stable-2_16_5/network/ - copied from r41595, 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] r41595 - /tags/stable-2_16_5/
by mzugec＠svn.opensuse.org 26 Oct '07

26 Oct '07

Author: mzugec Date: Fri Oct 26 15:05:25 2007 New Revision: 41595 URL: http://svn.opensuse.org/viewcvs/yast?rev=41595&view=rev Log: Created tag stable-2_16_5 Added: tags/stable-2_16_5/ -- 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] r41594 - in /trunk/network: VERSION package/yast2-network.changes src/lan/wireless.ycp
by mzugec＠svn.opensuse.org 26 Oct '07

26 Oct '07

Author: mzugec Date: Fri Oct 26 15:05:20 2007 New Revision: 41594 URL: http://svn.opensuse.org/viewcvs/yast?rev=41594&view=rev Log: leave WIRELESS_KEY_X and WIRELESS_WPA_PSK empty for "no encryption" auth mode (#335501) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/wireless.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=41594&r1=415… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Oct 26 15:05:20 2007 @@ -1 +1 @@ -2.16.4 +2.16.5 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Oct 26 15:05:20 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 26 15:01:43 CEST 2007 - mzugec(a)suse.de + +- leave WIRELESS_KEY_X and WIRELESS_WPA_PSK empty for "no encryption" + auth mode (#335501) +- 2.16.5 + +------------------------------------------------------------------- Fri Oct 26 12:38:52 CEST 2007 - mzugec(a)suse.de - when select dhcp don't remove static default GW for hotplug Modified: trunk/network/src/lan/wireless.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/wireless.ycp?rev… ============================================================================== --- trunk/network/src/lan/wireless.ycp (original) +++ trunk/network/src/lan/wireless.ycp Fri Oct 26 15:05:20 2007 @@ -337,7 +337,12 @@ continue; } - key = (string) UI::QueryWidget (`id (`key), `Value); + if (authmode!="no-encryption" && authmode!="eap") key = (string) UI::QueryWidget (`id (`key), `Value); + else { + key=""; + LanItems::wl_key[LanItems::wl_default_key] = ""; + LanItems::wl_wpa_psk = ""; + } type = (string) UI::QueryWidget (`id (`type_g), `CurrentButton); if (authmode == "psk") { @@ -406,10 +411,12 @@ if (authmode == "psk") { LanItems::wl_wpa_psk = key; + LanItems::wl_key[LanItems::wl_default_key] = ""; } else if (!authmode_wpa && authmode!="no-encryption") { LanItems::wl_key[LanItems::wl_default_key] = ckey; + LanItems::wl_wpa_psk = ""; } } -- 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] r41593 - in /branches/SuSE-SLE-10-SP2-Branch/autoinstallation: package/autoyast2.changes src/modules/AutoinstLVM.ycp
by ug＠svn.opensuse.org 26 Oct '07

26 Oct '07

Author: ug Date: Fri Oct 26 14:22:26 2007 New Revision: 41593 URL: http://svn.opensuse.org/viewcvs/yast?rev=41593&view=rev Log: reuse of LVM and EVMS fixed (#335763) Modified: branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/modules/AutoinstLVM.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/autoin… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes Fri Oct 26 14:22:26 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Oct 26 14:21:36 CEST 2007 - ug(a)suse.de + +- reuse of LVM and EVMS fixed (#335763) + +------------------------------------------------------------------- Tue Aug 7 16:40:36 CEST 2007 - ug(a)suse.de - no frame if no frametitle is defined in ask-questions Modified: branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/autoin… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/modules/AutoinstLVM.ycp Fri Oct 26 14:22:26 2007 @@ -34,6 +34,10 @@ 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 +94,37 @@ return (substring(d, 5) ); }); + /* 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, "evms/lvm2/"+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 ) + keepEVMS[p["evms_group"]:"x"] = add( keepEVMS[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 ); @@ -99,13 +132,16 @@ // and vice versa // it's not possible to mix LVM and EVMS with autoyast // + // FIXME: code dropped because EVMS looks like LVM too + // reusing EVMS fails then! + /* map<string, map> toDrop = filter(string k, map v, Storage::GetTargetMap(), ``(v["type"]:`CT_UNKNOWN==dropType)); foreach (string device, map volume_group, toDrop , ``{ string vgname = substring(device, 5); y2milestone("removing %1 %2",dropType,vgname); removeVolumeGroup(vgname); // FIXME: I expect this to work recursive }); - +*/ // FIXME foreach (string v, ExistingVGs, ``{ @@ -185,16 +221,27 @@ 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 +482,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("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