February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55235 - in /trunk/storage: package/yast2-storage.changes storage/src/include/do_proposal_flexible.ycp storage/src/inst_resize_dialog.ycp storage/src/modules/Storage.ycp
by jsrain＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: jsrain Date: Wed Feb 4 13:14:03 2009 New Revision: 55235 URL: http://svn.opensuse.org/viewcvs/yast?rev=55235&view=rev Log: updated proposal to allow user to say how to split disk space begtween existing Windows and new Linux Added: trunk/storage/storage/src/inst_resize_dialog.ycp Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/do_proposal_flexible.ycp trunk/storage/storage/src/modules/Storage.ycp 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 Feb 4 13:14:03 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 4 13:12:30 CET 2009 - jsrain(a)suse.cz + +- updated proposal to allow user to say how to split disk space + begtween existing Windows and new Linux + +------------------------------------------------------------------- Tue Feb 03 16:05:21 CET 2009 - aschnell(a)suse.de - select 'previous' device in tables after deleting devices (bnc Modified: trunk/storage/storage/src/include/do_proposal_flexible.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/do_p… ============================================================================== --- trunk/storage/storage/src/include/do_proposal_flexible.ycp (original) +++ trunk/storage/storage/src/include/do_proposal_flexible.ycp Wed Feb 4 13:14:03 2009 @@ -2753,14 +2753,26 @@ ``{ if( usable_for_win_resize(p,true) && p["device"]:""==pl[0,"device"]:"" ) - { + { integer cs = target[s,"cyl_size"]:1; p["resize"] = true; p["region",1] = - (p["winfo","new_size"]:0+cs-1) / cs; + (p["winfo","new_size"]:0+cs-1) / cs ; p["win_max_length"] = - (p["winfo","max_win_size"]:0+cs-1) / cs; + (p["winfo","max_win_size"]:0+cs-1) / cs; + // nil means partition to be defined + if (Storage::resize_partition == nil) + { + Storage::resize_partition = p["device"]:""; + Storage::resize_partition_data = p; + Storage::resize_cyl_size = cs; } + // if partitions match, override proposal with stored data + else if (Storage::resize_partition == p["device"]:"" && Storage::resize_partition != "") + { + p = Storage::resize_partition_data; + } + } return( p ); }); y2milestone( "get_inst_proposal res parts %1", @@ -3515,18 +3527,29 @@ pl = sort( map a, map b, pl, ``(a["size_k"]:0>b["size_k"]:0)); target[s,"partitions"] = - maplist( map p, target[s,"partitions"]:[], - ``{ + maplist( map p, target[s,"partitions"]:[], ``{ if( usable_for_win_resize(p,true) && p["device"]:""==pl[0,"device"]:"" ) - { + { integer cs = target[s,"cyl_size"]:1; p["resize"] = true; p["region",1] = - (p["winfo","new_size"]:0+cs-1) / cs; + (p["winfo","new_size"]:0+cs-1) / cs ; p["win_max_length"] = - (p["winfo","max_win_size"]:0+cs-1) / cs; + (p["winfo","max_win_size"]:0+cs-1) / cs; + // nil means partition to be defined + if (Storage::resize_partition == nil) + { + Storage::resize_partition = p["device"]:""; + Storage::resize_partition_data = p; + Storage::resize_cyl_size = cs; } + // if partitions match, override proposal with stored data + else if (Storage::resize_partition == p["device"]:"" && Storage::resize_partition != "") + { + p = Storage::resize_partition_data; + } + } return( p ); }); y2milestone( "get_inst_prop_vm res parts %1", Added: trunk/storage/storage/src/inst_resize_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_resize_… ============================================================================== --- trunk/storage/storage/src/inst_resize_dialog.ycp (added) +++ trunk/storage/storage/src/inst_resize_dialog.ycp Wed Feb 4 13:14:03 2009 @@ -0,0 +1,452 @@ +/** + * Module: inst_resize_dialog.ycp + * + * Authors: Thomas Roelz <tom(a)suse.de> + * Stefan Hundhammer <sh(a)suse.de> + * Jiri Srain + * + * Purpose: UI for setting how to split the disk between existing Windows and Linux + * + * FIXME: Get rid of code duplication between here and inst_resize_ui (resizing partition from a proposal) + * + * + * $Id: inst_resize_dialog.ycp 52739 2008-10-30 13:59:13Z aschnell $ + */ +{ + +textdomain"storage"; + +import "Arch"; +import "Mode"; +import "Mode"; +import "Storage"; +import "Popup"; +import "Partitions"; +import "Wizard"; +import "Product"; +import "Installation"; + +include "partitioning/partition_defines.ycp"; +include "partitioning/do_proposal_flexible.ycp"; + +list<integer> DiskUsage (string win_device) { + integer win_used = -1; + integer win_free = -1; + boolean mount_result = (boolean)SCR::Execute( .target.mount, + [ win_device, Installation::scr_destdir, + Installation::mountlog ]); + if( !mount_result ) { + y2error( "Current Windows device <%1> could not be mounted. Canceled", win_device ); + } + else + { + y2milestone( "Current Windows device <%1> mounted on %2.", win_device, Installation::scr_destdir ); + } + + // get usage information for the partition via df + list<map> df_result = (list<map>)SCR::Read(.run.df); + SCR::Execute(.target.umount, win_device); + y2debug( ".run.df: %1", df_result ); + + // filter out headline and other invalid entries + df_result = filter( map part, df_result, + ``( substring( part["spec"]:"", 0, 1 ) == "/" )); + + foreach( map part, df_result, { + if( part["spec"]:"" == win_device ) // find right entry + { + // get the usage values + // + win_used = tointeger(part["used"]:"-1"); + win_free = tointeger(part["free"]:"-1"); + + if( win_used != -1 && win_free != -1 ) { + win_used = win_used / 1024; // MB + win_free = win_free / 1024; // MB + y2milestone( ".run.df: win_used: <%1> win_free:<%2>", win_used, win_free ); + } + } + }); + return [ win_used, win_free ]; +} + +map _resize_result = nil; + +map ResizeResult() { + return _resize_result; +} + +symbol ResizeDialog (string win_device, integer cyl_size, map win_partition) { + + ///////////////////////////////////////////////////////////////////////// + // START: Initialize + ///////////////////////////////////////////////////////////////////////// + + boolean test_mode = Mode::test (); + boolean demo_mode = Mode::test (); + + // store + // + + integer win_used = -1; + integer win_free = -1; + integer min_win_free = -1; + integer new_win_size = -1; + integer linux_size = -1; + integer linux_min = 400; // this is the base value for space calculations (minimum installation) + + if ( test_mode ) // not just in demo mode! no HW probe in test mode! + { + win_used = 350; + win_free = 1500; + min_win_free = 50; + linux_size = 800; + linux_min = 400; + } + + ///////////////////////////////////////////////////////////////////////// + // END: Initialize + ///////////////////////////////////////////////////////////////////////// + + + y2milestone( "Cylinder size of target: <%1>", cyl_size ); + // Get region from win partition + // + list<integer> region = win_partition["region"]:[]; + + if( size( region ) != 2 ) { + y2error( "Invalid region <%1> in Windows partition data struct.", region ); + return nil; + } else + y2milestone( "Old region <%1> OK in Windows partition data struct.", region ); + + // mount the partition to execute some checks + // + list<integer> usage = DiskUsage (win_device); + win_used = usage[0]:-1; + win_free = usage[1]:-1; + if( win_used == -1 || win_free == -1 ) { + y2error( "The sizes for device <%1> could not be examined.", win_device ); + return nil; + } else { + // Apply some checks to determine if installing Linux is feasible at all. + // + boolean feasible = true; + + // Set minimal free Windows size to 200 MB. Running Windows with + // less disk space is no fun. + // + if ( min_win_free < 200 ) min_win_free = 200; + + // If this is more than the free space on the device Windows is already + // overcrowded and Linux shouldn't be installed. + // + if ( min_win_free > win_free ) return nil; + + if( win_free - min_win_free < linux_min ) return nil; + + // Try to reserve 1.5 GB for linux (default installation). + // Otherwise get as much as possible + // + if ( win_free - min_win_free > 1500 ) + linux_size = 1500; + else + linux_size = win_free - min_win_free; + } + + if (Storage::resize_partition != nil) // already resized + { + integer win_size = Storage::resize_partition_data["region",1]:-1; +y2internal ("Win size read: %1", win_size); +y2internal ("Part info: %1", Storage::resize_partition_data); +y2internal ("Cyl size: %1", Storage::resize_cyl_size); + if (win_size != -1) + { + win_size = win_size * Storage::resize_cyl_size / (1024*1024); + linux_size = win_used + win_free - win_size; + } + } + + ///////////////////////////////////////////////////////////////////////// + // END: Preliminary action + ///////////////////////////////////////////////////////////////////////// + + ///////////////////////////////////////////////////////////////////////// + // START: GUI + ///////////////////////////////////////////////////////////////////////// + + boolean test_simple_ui = false; // set to "true" to test non-graphical version + + // Unit for parition resizing - currently Megabytes + string unit = _("MB");; + + // Labels for bar graph. "%1" will be replace with a numeric value. + string bargraph_label_win_used = _("Windows\nUsed\n%1 ") + unit; + // Labels for bar graph. "%1" will be replace with a numeric value. + string bargraph_label_win_free = _("Windows\nFree\n%1 ") + unit; + // Labels for bar graph. "%1" will be replace with a numeric value. + string bargraph_label_linux = _("Linux\n%1 ") + unit; + + // Labels for input fields. "%1" will be replaced with the current unit (MB). + string field_label_win_free = sformat( _("Windows Free (%1)"), unit); + // Labels for input fields. "%1" will be replaced with the current unit (MB). + string field_label_linux = sformat( _("Linux (%1)"), unit); + + term contents = `Empty(); + + + + // Help text for Windows partition resizing - + // common part for both graphical mode (with bar graphs) + // and non-graphical mode (text only). + string helptext = _(" +Choose the new size for your Windows partition. +"); + + // help text (common to both modes), continued + helptext = helptext + _(" + +The actual resizing will be performed only after you confirm all your +settings in the last installation dialog. Until then, your Windows +partition will remain untouched. +"); + + // help text (common to both modes), continued + helptext = helptext + _(" + +To skip resizing your Windows partition, press +Back. + +"); + + + if ( UI::HasSpecialWidget(`Slider ) && + UI::HasSpecialWidget(`BarGraph ) && + ! test_simple_ui ) + { + contents = `VBox( + `VStretch(), + // Headline above bar graph that displays current windows partition size + `Left( `Label( _("Now")) ), + `BarGraph( + [ win_used, win_free ], + [ + bargraph_label_win_used, + bargraph_label_win_free + ] + ), + `VStretch(), + + // Headline above bar graph that displays future windows and linux partitions + `Left( `Label( _("After Installation") ) ), + `PartitionSplitter( `id(`linux_size), + win_used, win_free, + linux_size, linux_min, min_win_free, + bargraph_label_win_used, + bargraph_label_win_free, + bargraph_label_linux, + field_label_win_free, + field_label_linux + ), + `VStretch() + ); + + + // help text, continued - graphical mode only + // this help text will be appended to the help text common to both modes. + helptext = helptext + _(" + +The upper bar graph displays the current situation. +The lower bar graph displays the situation after the installation (after +the partition resize). + +"); + + // help text (graphical mode), continued + helptext = helptext + _(" + +Drag the slider or enter a numeric value in either +input field to adjust the suggested value. +"); + + // help text (graphical mode), continued + helptext = helptext + _(" + +Within the space you reserve for Linux, partitions will automatically be +created as necessary. +"); + } + else // no special widgets -> simple fallback UI + { + contents = `HVSquash( + `VBox( + `HBox( + // Label for used part of the Windows partition in non-graphical mode + `HWeight(3, `Right(`Label(_("Windows Used")))), + `HWeight(2, `Label(`opt(`outputField), sformat("%1", win_used ))), + `HWeight(3, `Left(`Label( unit ))) + ), + `VSpacing(0.5), + `HBox( + // Label for free part of the Windows partition in non-graphical mode + `HWeight(3, `Right(`Label(_("Free")))), + `HWeight(2, `Label(`opt(`outputField), sformat("%1", win_free ))), + `HWeight(3, `Left(`Label( unit ))) + ), + `VSpacing(0.5), + `HBox( + // Edit field label for linux partition size in non-graphical mode + `HWeight(3, `Right(`Bottom(`Label(_("Linux"))))), + `HWeight(2, `IntField( `id(`linux_size), + "", // label (above) + linux_min, // min + win_free - min_win_free, // max + linux_size // initial + ) + ), + `HWeight(3, `Left(`Bottom(`Label( unit )))) + ) + ) + ); + + // help text, continued - non-graphical mode only + // this help text will be appended to the help text common to both modes. + helptext = helptext + _(" +Enter a value for the size of your Linux installation. +The partitions will automatically be created within this range +as required for &product;. + +"); + + // help text (non-graphical mode), continued + helptext = helptext + _(" + +Windows Used is the size of the used part of your Windows partition. +"); + + // help text (non-graphical mode), continued + helptext = helptext + _(" +Free indicates the current free space (before the Linux +installation) on the partition. +"); + } + + +y2internal ("Opening dialog"); + Wizard::SetContents( // Set the dialog header + _("Resizing the Windows Partition"), + contents, helptext, true, true); + + + ///////////////////////////////////////////////////////////////////////// + // END: GUI + ///////////////////////////////////////////////////////////////////////// + + ///////////////////////////////////////////////////////////////////////// + // START: Main loop + ///////////////////////////////////////////////////////////////////////// + + symbol ret = nil; + repeat { + ret = (symbol)Wizard::UserInput(); + + if( ret == `abort && Popup::ReallyAbort(true) ) + return `abort; + + if( ret == `next ) + { + // Get the value the user adjusted. If s/he entered a value + // too big or too small this is automatically adjusted to the + // biggest/smallest value possible (by Qt). + // + linux_size = (integer)UI::QueryWidget(`id(`linux_size), `Value); + new_win_size = win_used + win_free - linux_size; + + y2milestone( "Linux size: <%1> - New Win size: <%2>", + linux_size, new_win_size); + } + + if( ret == `back ) + { + return `back; + } + } until ( ret == `next || ret == `back || ret == `cancel ); + + ///////////////////////////////////////////////////////////////////////// + // END: Main loop + ///////////////////////////////////////////////////////////////////////// + + ///////////////////////////////////////////////////////////////////////// + // START: Final action + ///////////////////////////////////////////////////////////////////////// + + // Now update the target map to the new situation + // + if( !test_mode ) { + // adjust the partition entry in the target map to reflect the new size + + // add flag and new size to the windows partition + // + win_partition = add( win_partition, "resize", true ); + + // adjust the region list in the windows partition to reflect the new size + // + integer win_start = region[0]:0; // same as before resize +y2internal ("Win size: %1", new_win_size); +y2internal ("Cylinder: %1", cyl_size); + integer new_length_i = PartedSizeToCly( (tofloat(new_win_size) * 1024.0 * 1024.0), cyl_size ); + + region = [win_start, new_length_i]; + win_partition = add( win_partition, "region", region); + + y2milestone( "New region of Windows partition after resize: <%1>", region ); + _resize_result = win_partition; + return `next; + } + ///////////////////////////////////////////////////////////////////////// + // END: final action + ///////////////////////////////////////////////////////////////////////// + + return ret; +} + +// main function +if (Storage::resize_partition == nil) { + Storage::ResetOndiskTarget(); + Storage::AddMountPointsForWin(Storage::GetTargetMap()); + get_inst_prop (Storage::GetTargetMap ()); + if (Storage::resize_partition == nil) // no resize + { + Storage::ResetOndiskTarget(); + Storage::resize_partition = ""; + return `auto; + } +} +if (Storage::resize_partition == "") { + return `auto; +} +symbol ret = ResizeDialog (Storage::resize_partition, Storage::resize_cyl_size, Storage::resize_partition_data); +if (ret == `next) +{ + // store info about partition resize needed for the proposal + Storage::resize_partition_data = ResizeResult(); + // reset proposal, recreate it + Storage::ResetOndiskTarget(); + Storage::AddMountPointsForWin(Storage::GetTargetMap()); + map prop = $[]; + prop = get_inst_prop( Storage::GetTargetMap()); + y2milestone( "prop ok:%1", prop["ok"]:false ); + if( prop["ok"]:false ) { + Storage::SetTargetMap( prop["target"]:$[] ); + Storage::SetPartProposalMode( "accept" ); + y2milestone( "PROPOSAL: %1", Storage::ChangeText()); + } else { + Storage::SetPartProposalMode( "impossible" ); + } + Storage::SetPartProposalFirst( false ); + Storage::SetPartProposalActive( true ); + y2milestone( "prop=%1", prop ); + } +return ret; + +} 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 Feb 4 13:14:03 2009 @@ -69,6 +69,16 @@ import "LibStorage::CommitInfo"; +// simple resize functionality - dialog to set size of Linux and Windows before proposal + +global string resize_partition = nil; + +global map resize_partition_data = nil; + +global integer resize_cyl_size = nil; + +// end of resizing functions + global void UpdateClassified(string key, string pwd); -- 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] r55234 - in /branches/SuSE-Code-11-Branch/nfs-server: ./ VERSION package/yast2-nfs-server.changes src/routines.ycp src/ui.ycp
by mvidner＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: mvidner Date: Wed Feb 4 13:12:04 2009 New Revision: 55234 URL: http://svn.opensuse.org/viewcvs/yast?rev=55234&view=rev Log: Merged revisions 55211,55224 via svnmerge from http://svn.opensuse.org/svn/yast/trunk/nfs-server ........ r55211 | mvidner | 2009-02-03 16:26:28 +0100 (Út, 03 úno 2009) | 2 lines Fixed the help for NFS4 bind mounts; added crossmnt (bnc#471874). ........ r55224 | mvidner | 2009-02-04 10:58:24 +0100 (St, 04 úno 2009) | 2 lines Sex sells, this is a better example. ........ Modified: branches/SuSE-Code-11-Branch/nfs-server/ (props changed) branches/SuSE-Code-11-Branch/nfs-server/VERSION branches/SuSE-Code-11-Branch/nfs-server/package/yast2-nfs-server.changes branches/SuSE-Code-11-Branch/nfs-server/src/routines.ycp branches/SuSE-Code-11-Branch/nfs-server/src/ui.ycp Modified: branches/SuSE-Code-11-Branch/nfs-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/nfs-serve… ============================================================================== --- branches/SuSE-Code-11-Branch/nfs-server/VERSION (original) +++ branches/SuSE-Code-11-Branch/nfs-server/VERSION Wed Feb 4 13:12:04 2009 @@ -1 +1 @@ -2.17.5 +2.17.6 Modified: branches/SuSE-Code-11-Branch/nfs-server/package/yast2-nfs-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/nfs-serve… ============================================================================== --- branches/SuSE-Code-11-Branch/nfs-server/package/yast2-nfs-server.changes (original) +++ branches/SuSE-Code-11-Branch/nfs-server/package/yast2-nfs-server.changes Wed Feb 4 13:12:04 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 3 16:26:12 CET 2009 - mvidner(a)suse.cz + +- Fixed the help for NFS4 bind mounts; added crossmnt (bnc#471874). +- 2.17.6 + +------------------------------------------------------------------- Wed Dec 3 16:07:28 CET 2008 - kmachalkova(a)suse.cz - Missing strings marked for translation (bnc#449700) Modified: branches/SuSE-Code-11-Branch/nfs-server/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/nfs-serve… ============================================================================== --- branches/SuSE-Code-11-Branch/nfs-server/src/routines.ycp (original) +++ branches/SuSE-Code-11-Branch/nfs-server/src/routines.ycp Wed Feb 4 13:12:04 2009 @@ -200,7 +200,7 @@ if (withfsid) return default_options; else - return "fsid=0," + default_options; + return "fsid=0,crossmnt" + default_options; // bnc#471874 c1 } Modified: branches/SuSE-Code-11-Branch/nfs-server/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/nfs-serve… ============================================================================== --- branches/SuSE-Code-11-Branch/nfs-server/src/ui.ycp (original) +++ branches/SuSE-Code-11-Branch/nfs-server/src/ui.ycp Wed Feb 4 13:12:04 2009 @@ -511,7 +511,16 @@ // Help, part 4 of 5, caution about fsid=0 in case NFSv4 is enabled. help_text = help_text + _("The NFSv4 option is enabled in the previous page. Make sure that only one exported filesystem is marked with the fsid=0 option for a particular client."); - help_text = help_text + _("In case of multiple exports to a NFSv4 client, you need to bind the exported paths with no fsid=0 to the one with fsid=0. To do this, add another export option (bind=/target/path), where /target/path amounts to some directory existing below the fsid=0 exported tree."); + // bnc#471874, NFS4 is complex and so is our UI :-/ + // but let's fix the help at least + // Watch out, the space is necessary between br and slash. + help_text = help_text + _("In case of multiple exports to a NFSv4 client, +you need to bind the exported paths with no fsid=0 to the one with fsid=0. +To export the server paths <tt>/Eve</tt> and <tt>/Adam</tt> as +<tt>/</tt> and <tt>/husband</tt>, respectively, use +<pre>/Eve 10.0.0.1(fsid=0,crossmnt,ro,...) +/Eve/husband 10.0.0.1(bind=/Adam,ro,...)</pre> +"); } // Help, part 5 of 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] r55233 - /trunk/storage/libstorage/src/Graph.cc
by aschnell＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: aschnell Date: Wed Feb 4 12:49:35 2009 New Revision: 55233 URL: http://svn.opensuse.org/viewcvs/yast?rev=55233&view=rev Log: - work on styles for nodes and edges Modified: trunk/storage/libstorage/src/Graph.cc Modified: trunk/storage/libstorage/src/Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Graph.cc?… ============================================================================== --- trunk/storage/libstorage/src/Graph.cc (original) +++ trunk/storage/libstorage/src/Graph.cc Wed Feb 4 12:49:35 2009 @@ -18,53 +18,78 @@ namespace storage { - enum Rank { RANK_NONE, RANK_DISK, RANK_PARTITION, RANK_MD, RANK_LVMVG, RANK_LVMLV, - RANK_MOUNTPOINT }; - typedef array<Rank, 6> Ranks; - const Ranks ranks = { { RANK_DISK, RANK_PARTITION, RANK_MD, RANK_LVMVG, RANK_LVMLV, - RANK_MOUNTPOINT } }; + enum NodeType { NODE_DISK, NODE_PARTITION, NODE_MDRAID, NODE_LVMVG, NODE_LVMLV, NODE_MOUNTPOINT }; struct Node { - Node(const string& id, Rank rank, const string& label, const string& attributes = "") - : id(id), rank(rank), label(label), attributes(attributes) + Node(NodeType type, const string& id, const string& label) + : type(type), id(id), label(label) {} + NodeType type; string id; - Rank rank; string label; - string attributes; }; + + enum EdgeType { EDGE_SUBDEVICE, EDGE_MOUNT, EDGE_USED }; + struct Edge { - Edge(const string& id1, const string& id2, const string& attributes = "") - : id1(id1), id2(id2), attributes(attributes) + Edge(EdgeType type, const string& id1, const string& id2) + : type(type), id1(id1), id2(id2) {} + EdgeType type; string id1; string id2; - string attributes; }; + + typedef array<NodeType, 6> Ranks; + const Ranks ranks = { { NODE_DISK, NODE_PARTITION, NODE_MDRAID, NODE_LVMVG, NODE_LVMLV, + NODE_MOUNTPOINT } }; + + string dotQuote(const string& str) { return '"' + boost::replace_all_copy(str, "\"", "\\\"") + '"'; } + std::ostream& operator<<(std::ostream& s, const Node& node) { s << dotQuote(node.id) << " [label=" << dotQuote(node.label); - if (!node.attributes.empty()) - s << ", " << node.attributes; + switch (node.type) + { + case NODE_DISK: + s << ", color=red, fillcolor=yellow"; + break; + case NODE_PARTITION: + s << ", color=blue, fillcolor=lightblue"; + break; + case NODE_MOUNTPOINT: + s << ", color=green, fillcolor=lightgreen"; + break; + } return s << "];"; } std::ostream& operator<<(std::ostream& s, const Edge& edge) { s << dotQuote(edge.id1) << " -> " << dotQuote(edge.id2); - if (!edge.attributes.empty()) - s << " [" << edge.attributes << "]"; + switch (edge.type) + { + case EDGE_SUBDEVICE: + s << " [color=blue]"; + break; + case EDGE_MOUNT: + s << " [color=green]"; + break; + case EDGE_USED: + s << " [color=red]"; + break; + } return s << ";"; } @@ -85,12 +110,12 @@ { case DISK: { - Node disk_node("device:" + i1->device, RANK_DISK, i1->device); + Node disk_node(NODE_DISK, "device:" + i1->device, i1->device); nodes.push_back(disk_node); if (!i1->usedByDevice.empty()) { - edges.push_back(Edge(disk_node.id, "device:" + i1->usedByDevice)); + edges.push_back(EDGE_USED, disk_node.id, "device:" + i1->usedByDevice); } deque<PartitionInfo> partitions; @@ -101,22 +126,22 @@ if (i2->partitionType == EXTENDED) continue; - Node partition_node("device:" + i2->v.device, RANK_PARTITION, i2->v.device); + Node partition_node(NODE_PARTITION, "device:" + i2->v.device, i2->v.device); nodes.push_back(partition_node); - edges.push_back(Edge(disk_node.id, partition_node.id)); + edges.push_back(EDGE_SUBDEVICE, disk_node.id, partition_node.id); if (!i2->v.usedByDevice.empty()) { - edges.push_back(Edge(partition_node.id, "device:" + i2->v.usedByDevice, "color=green")); + edges.push_back(EDGE_USED, partition_node.id, "device:" + i2->v.usedByDevice); } if (!i2->v.mount.empty()) { - Node mountpoint_node("mountpoint:" + i2->v.mount, RANK_MOUNTPOINT, i2->v.mount); + Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.mount, i2->v.mount); nodes.push_back(mountpoint_node); - edges.push_back(Edge(partition_node.id, mountpoint_node.id, "color=blue")); + edges.push_back(EDGE_MOUNT, partition_node.id, mountpoint_node.id); } } @@ -124,7 +149,7 @@ case LVM: { - Node vg_node("device:" + i1->device, RANK_LVMVG, i1->device); + Node vg_node(NODE_LVMVG, "device:" + i1->device, i1->device); nodes.push_back(vg_node); deque<LvmLvInfo> lvs; @@ -132,17 +157,17 @@ for (deque<LvmLvInfo>::iterator i2 = lvs.begin(); i2 != lvs.end(); ++i2) { - Node lv_node("device:" + i2->v.device, RANK_LVMLV, i2->v.device); + Node lv_node(NODE_LVMLV, "device:" + i2->v.device, i2->v.device); nodes.push_back(lv_node); - edges.push_back(Edge(vg_node.id, lv_node.id)); + edges.push_back(EDGE_SUBDEVICE, vg_node.id, lv_node.id); if (!i2->v.mount.empty()) { - Node mountpoint_node("mountpoint:" + i2->v.mount, RANK_MOUNTPOINT, i2->v.mount); + Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.mount, i2->v.mount); nodes.push_back(mountpoint_node); - edges.push_back(Edge(lv_node.id, mountpoint_node.id)); + edges.push_back(EDGE_MOUNT, lv_node.id, mountpoint_node.id); } } @@ -155,20 +180,20 @@ for (deque<MdInfo>::iterator i2 = mds.begin(); i2 != mds.end(); ++i2) { - Node md_node("device:" + i2->v.device, RANK_MD, i2->v.device, "color=red, fillcolor=yellow"); + Node md_node(NODE_MDRAID, "device:" + i2->v.device, i2->v.device); nodes.push_back(md_node); if (!i2->v.usedByDevice.empty()) { - edges.push_back(Edge(md_node.id, "device:" + i2->v.usedByDevice)); + edges.push_back(EDGE_USED, md_node.id, "device:" + i2->v.usedByDevice); } if (!i2->v.mount.empty()) { - Node mountpoint_node("mountpoint:" + i2->v.mount, RANK_MOUNTPOINT, i2->v.mount); + Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.mount, i2->v.mount); nodes.push_back(mountpoint_node); - edges.push_back(Edge(md_node.id, mountpoint_node.id)); + edges.push_back(EDGE_MOUNT, md_node.id, mountpoint_node.id); } } @@ -196,7 +221,7 @@ { list<string> ids; for (list<Node>::const_iterator node = nodes.begin(); node != nodes.end(); ++node) - if (node->rank == *rank) + if (node->type == *rank) ids.push_back(dotQuote(node->id)); if (!ids.empty()) -- 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] r55232 - /tags/branch-SLE-10-SP3-2_13_212/installation/
by locilka＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: locilka Date: Wed Feb 4 12:46:52 2009 New Revision: 55232 URL: http://svn.opensuse.org/viewcvs/yast?rev=55232&view=rev Log: Created tag branch-SLE-10-SP3-2_13_212 for installation Added: tags/branch-SLE-10-SP3-2_13_212/installation/ - copied from r55231, branches/SuSE-SLE-10-SP3-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] r55231 - /tags/branch-SLE-10-SP3-2_13_212/
by locilka＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: locilka Date: Wed Feb 4 12:46:50 2009 New Revision: 55231 URL: http://svn.opensuse.org/viewcvs/yast?rev=55231&view=rev Log: Created tag branch-SLE-10-SP3-2_13_212 Added: tags/branch-SLE-10-SP3-2_13_212/ -- 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] r55230 - /branches/SuSE-Code-11-Branch/nfs-server/
by mvidner＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: mvidner Date: Wed Feb 4 12:45:11 2009 New Revision: 55230 URL: http://svn.opensuse.org/viewcvs/yast?rev=55230&view=rev Log: Initialized merge tracking via "svnmerge" with revisions "1-54122" from http://svn.opensuse.org/svn/yast/trunk/nfs-server Modified: branches/SuSE-Code-11-Branch/nfs-server/ (props changed) -- 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] r55229 - /branches/SuSE-Code-11-Branch/nfs-server/
by mvidner＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: mvidner Date: Wed Feb 4 12:41:44 2009 New Revision: 55229 URL: http://svn.opensuse.org/viewcvs/yast?rev=55229&view=rev Log: no need to track merges from SLE10 SP1 Modified: branches/SuSE-Code-11-Branch/nfs-server/ (props changed) -- 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] r55228 - in /branches/SuSE-SLE-10-SP3-Branch/installation: VERSION package/yast2-installation.changes src/clients/copy_files_finish.ycp
by locilka＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: locilka Date: Wed Feb 4 12:34:24 2009 New Revision: 55228 URL: http://svn.opensuse.org/viewcvs/yast?rev=55228&view=rev Log: - Removing old additional control files during update. Writing new ones according to the current list of add-ons (bnc #471929). - 2.13.212 Modified: branches/SuSE-SLE-10-SP3-Branch/installation/VERSION branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/copy_files_finish.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/VERSION Wed Feb 4 12:34:24 2009 @@ -1 +1 @@ -2.13.211 +2.13.212 Modified: branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes Wed Feb 4 12:34:24 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 4 12:30:40 CET 2009 - locilka(a)suse.cz + +- Removing old additional control files during update. Writing new + ones according to the current list of add-ons (bnc #471929). +- 2.13.212 + +------------------------------------------------------------------- Wed Jun 11 15:59:06 CEST 2008 - locilka(a)suse.cz - Lslezak's patch for AddOnProducts to open up pattern selector Modified: branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/copy_files_finish.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/copy_files_finish.ycp Wed Feb 4 12:34:24 2009 @@ -79,21 +79,33 @@ "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control.xml'"); SCR::Execute (.target.bash, "/bin/chmod 0644 " + "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control.xml'"); + // Copy also control files of add-on products string cf_dir = (string)SCR::Read (.target.tmpdir) + "/control_files"; + string system_cf_dir = Installation::destdir + Directory::etcdir + "/control_files"; + + // BNC #471929 + // Removing previously used control files (and order.ycp) + y2milestone ( + "Removing %1 -> %2", + system_cf_dir, + SCR::Execute (.target.bash, sformat ("rm -rf '%1'", String::Quote (system_cf_dir))) + ); + if (size (AddOnProduct::control_files_to_add) > 0) { - SCR::Execute (.target.bash, "/bin/mkdir '" + - String::Quote (Installation::destdir) + Directory::etcdir + "/control_files'"); + SCR::Execute (.target.bash, "/bin/mkdir -p '" + String::Quote (system_cf_dir) + "'"); + foreach (string file, AddOnProduct::control_files_to_add, { SCR::Execute (.target.bash, "/bin/cp " + cf_dir + "/" + file + " " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files'"); + "'" + String::Quote (system_cf_dir) + "'"); SCR::Execute (.target.bash, "/bin/chmod 0644 " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/" + file + "'"); + "'" + String::Quote (system_cf_dir) + file + "'"); }); - SCR::Write (.target.ycp, Installation::destdir + Directory::etcdir + "/control_files/order.ycp", AddOnProduct::control_files_to_add); - SCR::Execute (.target.bash, "/bin/chmod 0644 " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/order.ycp'"); + + SCR::Write (.target.ycp, system_cf_dir + "/order.ycp", AddOnProduct::control_files_to_add); + + SCR::Execute (.target.bash, "/bin/chmod 0644 " + "'" + String::Quote (system_cf_dir) + "/order.ycp'"); } // Remove old eula.txt -- 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] r55227 - /tags/stable-2_18_0/bootloader/
by juhliarik＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: juhliarik Date: Wed Feb 4 12:29:31 2009 New Revision: 55227 URL: http://svn.opensuse.org/viewcvs/yast?rev=55227&view=rev Log: Created tag stable-2_18_0 for bootloader Added: tags/stable-2_18_0/bootloader/ - copied from r55226, 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] r55226 - /trunk/bootloader/VERSION
by juhliarik＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: juhliarik Date: Wed Feb 4 12:29:21 2009 New Revision: 55226 URL: http://svn.opensuse.org/viewcvs/yast?rev=55226&view=rev Log: new version 2.18.0 Modified: trunk/bootloader/VERSION Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=55226&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Wed Feb 4 12:29:21 2009 @@ -1 +1 @@ -2.17.46 +2.18.0 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0