Author: jsuchome Date: Mon Jan 7 15:38:27 2008 New Revision: 43308 URL: http://svn.opensuse.org/viewcvs/yast?rev=43308&view=rev Log: - /etc/fstab (#350539): do not offer devpts entry do not offer adding mount points for removable devices - changed some button labels (Repair to Change), adapted appropriate help texts (#350538) - 2.16.3 Modified: trunk/repair/VERSION trunk/repair/package/yast2-repair.changes trunk/repair/src/OSRFstab.ycp trunk/repair/src/OSRPkg.ycp trunk/repair/src/OSRPopup.ycp trunk/repair/src/OSRPtbl.ycp trunk/repair/src/OSRRepairUI.ycp Modified: trunk/repair/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/VERSION?rev=43308&r1=43307&r2=43308&view=diff ============================================================================== --- trunk/repair/VERSION (original) +++ trunk/repair/VERSION Mon Jan 7 15:38:27 2008 @@ -1 +1 @@ -2.16.2 +2.16.3 Modified: trunk/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.changes?rev=43308&r1=43307&r2=43308&view=diff ============================================================================== --- trunk/repair/package/yast2-repair.changes (original) +++ trunk/repair/package/yast2-repair.changes Mon Jan 7 15:38:27 2008 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Mon Jan 7 15:20:18 CET 2008 - jsuchome@suse.cz + +- /etc/fstab (#350539): + do not offer devpts entry + do not offer adding mount points for removable devices +- changed some button labels (Repair to Change), adapted appropriate + help texts (#350538) +- 2.16.3 + +------------------------------------------------------------------- Mon Dec 3 15:14:51 CET 2007 - jsuchome@suse.cz - merged texts from proofread Modified: trunk/repair/src/OSRFstab.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRFstab.ycp?rev=43308&r1=43307&r2=43308&view=diff ============================================================================== --- trunk/repair/src/OSRFstab.ycp (original) +++ trunk/repair/src/OSRFstab.ycp Mon Jan 7 15:38:27 2008 @@ -186,7 +186,7 @@ global define void OSRFstab () { foreach (string type, [ - "pts", "proc", "usb", "swap", "cdrom", "floppy", + "proc", "usb", "swap", "cdrom", "floppy", "root", "zip", "dev", "nfs", "sys", "debug" ], { fstab_defaults [type] = FileSystems::GetFstabDefaultMap (type); @@ -506,9 +506,13 @@ */ define boolean check_fs_vfstype(list<string> line, map part) ``{ +y2internal ("line: %1", line); if (line[2]:"" == nil || line[2]:"" == "") return false; line[2] = remove_blanks (line[2]:""); +y2internal ("removed: %1", line[2]:""); +y2warning ("part %1", part); +y2internal ("FileSystems::GetMountString (%1):%2", part["detected_fs"]:`unknown, FileSystems::GetMountString (part["detected_fs"]:`unknown, "!")); if (!(FileSystems::GetMountString (part["detected_fs"]:`unknown, "!") == line[2]:"" @@ -679,11 +683,24 @@ y2warning ("no entry for %1 found in the fstab",p); if (part["used_by"]:"" != "") { - y2warning ("it is a device used by other entity (e.g. LVM, EVMS, MD): ignoring"); + y2milestone ("it is a device used by other entity (e.g. LVM, EVMS, MD): ignoring"); + return true; + } + else if ("cdrom" == part["found"]:"") + { + // bug #185575 + y2milestone ("cdrom/dvd entry (%1) should not be in fstab", p); + return true; + } + map disk = Storage::GetDiskPartition (part["device"]:""); + map diskmap = Storage::GetDisk (Storage::GetTargetMap(), disk["disk"]:""); + if (diskmap["hotpluggable"]:false) + { + y2milestone ("%1 is hotpluggable, doesn't need fstab entry", p); return true; } missing_devs = add (missing_devs, p); - missing_devs = toset (missing_devs); + missing_devs = toset (add (missing_devs, p)); return false; } } @@ -866,8 +883,10 @@ fs_vfstype = check_fs_vfstype(line, part); fs_mntops = check_fs_mntops( line); } - else if (contains (checked_partitions, part["dev_name"]:"") && - part["found"]:"" == "dev") + else if ((part["found"]:"" == "dev") && + (contains (checked_partitions, part["dev_name"]:"") || + contains (checked_partitions, part["device"]:"")) + ) { // check root first with CheckRootEntry!! if (line[1]:"" == "/") @@ -970,7 +989,6 @@ [ fstab_defaults ["usb", "spec"]:"", fstab_defaults ["proc", "spec"]:"", - fstab_defaults ["pts", "spec"]:"" ] ); dev2check = (list<string>) union (dev2check, @@ -1012,7 +1030,7 @@ }); // check all mountable partitions + swap + usb+ proc +... foreach (string p, devices2check(), ``{ - y2milestone("-----check partition and usb,proc,pts %1", p); + y2milestone("-----check partition and usb,proc %1", p); if (!haskey (fstab2part, p)) check_dev_entry(p); }); @@ -1110,11 +1128,6 @@ fstline["mount"] = find_next_media_file (part["found"]:""); new_entries[dev] = fstline; } - else if ("cdrom" == part["found"]:"") - { - map ret = Storage::MakeCdromFstabEntry (part); -// new_entries[dev] = ret; // workaround for bug #185575 - } else { y2error("creating an entry for %1 is not possible (3)", dev); } @@ -1195,33 +1208,29 @@ if (size (new_entries) == 0) return `error; + // help text for the /etc/fstab dialog string help_text = _(" -<P>No valid fstab entry was found -for the devices listed in the table. -</P> +<P>No valid fstab entry was found for the devices listed in the table.</P> <P> -Select the devices for which -to create a new fstab entry -and enter a mount point. -</P> -<P>After creating mount points for all -devices, press Repair -to continue. +Select the devices for which to create a new fstab entry. </P> -"); +<p>Press <b>Change</b> to accept the changes proposed in this dialog.</p>"); help_text = help_text + - + // help text for table entry OSRPopup::build_label_description (device_label, _("The name of the device for which no valid fstab entry was found. ")) + + // help text for table entry OSRPopup::build_label_description (mount_label, _("The mount point for the found device. This mount point is created in the file system. If you leave the mount point field empty, no fstab entry will be created. ")) + - OSRPopup::build_label_description (create_mp_label, _("Add a mount point for a device.")); + // help text for Change Mount Point button + OSRPopup::build_label_description (create_mp_label, _("Specify a mount point for a device different from the proposed one.")); + // dialog caption OSRPopup::OpenSuggestDialog(_("Add fstab Entries"), _(" Select the devices for which to @@ -1788,7 +1797,7 @@ help_text, `VBox ( `Left(`Label(existing_label)), - `Table (`id(`table_e), `opt(`disabled), + `Table (`id(`table_e), `header (state_label, fstab_line_label), modify_items (nlines, ignore_label, true) ), Modified: trunk/repair/src/OSRPkg.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRPkg.ycp?rev=43308&r1=43307&r2=43308&view=diff ============================================================================== --- trunk/repair/src/OSRPkg.ycp (original) +++ trunk/repair/src/OSRPkg.ycp Mon Jan 7 15:38:27 2008 @@ -333,7 +333,7 @@ Checking the package database with a different product should be skipped. -Really continue? +Really continue to package database check? "), OSRCommon::tool_name, source_product["productname"]:"", source_product["productversion"]:"", Modified: trunk/repair/src/OSRPopup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRPopup.ycp?rev=43308&r1=43307&r2=43308&view=diff ============================================================================== --- trunk/repair/src/OSRPopup.ycp (original) +++ trunk/repair/src/OSRPopup.ycp Mon Jan 7 15:38:27 2008 @@ -27,6 +27,8 @@ // pushbutton label global string repair_label = _("&Repair"); // pushbutton label + global string change_label = _("&Change"); + // pushbutton label global string recover_label = _("&Recover"); // pushbutton label global string ignore_label = _("&Ignore"); @@ -126,32 +128,29 @@ /** * Open a dialog with the term r_options in the center. */ - global define boolean OpenMainRepairDialog(string headline, string error_text, term r_options ) ``{ + global define boolean OpenMainRepairDialog(string headline, string error_text, term r_options ) + { - // Build the options for the user dialog - term contents = `HVSquash ( - `HBox( - `HSpacing(2), - `VBox( - `VSpacing(1), - `Left(`Heading( headline)), - `VSpacing(1), - `Left(`Label(error_text)), - `VSpacing(1), - `RadioButtonGroup(`id(`rb), r_options), - `VSpacing(1), - `Bottom( `HSquash(`HBox( - `PushButton(`id(`ok), `opt(`default ), Label::OKButton()), - `PushButton(`id(`cancel), skip_label), - `HSpacing(2), - `Right(`PushButton(`id(`help), help_label )) - ))) - ), - `HSpacing(2))); + term contents = `HVSquash (`HBox (`HSpacing(2), `VBox ( + `VSpacing (1), + `Left (`Heading (headline)), + `VSpacing (1), + `Left (`Label (error_text)), + `VSpacing (1), + `RadioButtonGroup (`id(`rb), r_options), + `VSpacing (1), + `Bottom (`HSquash (`HBox ( + `PushButton (`id(`ok), `opt (`default ), Label::OKButton()), + `PushButton (`id(`cancel), skip_label), + `HSpacing(2), + `Right (`PushButton (`id(`help), help_label)) + ))), + `VSpacing (0.2) + ), `HSpacing(2))); - boolean ret = UI::OpenDialog( contents ); - UI::SetFocus(`id(`ok)); - return ret; + boolean ret = UI::OpenDialog( contents ); + UI::SetFocus(`id(`ok)); + return ret; } /** @@ -159,9 +158,7 @@ */ global define boolean OpenSuggestDialog(string headline, string message, string help_text, term body, integer hweight )``{ - term message_box = `VBox(`Left(`Label(message )), - `VSpacing(1) - ); + term message_box = `VBox (`Left (`Label (message)), `VSpacing(1)); integer headline_box_wight = 20; @@ -171,28 +168,24 @@ headline_box_wight = 10; } - term contents = - `HBox( - `HWeight( 25, `RichText( help_text )), - `HWeight( 1, `HSpacing(1)), - `HWeight( 60, `VBox( - `VWeight(headline_box_wight,`VBox( - `Left(`Heading(headline )), - //`VSpacing(1), - message_box - ) - ), - `VWeight(hweight, body ), - `VWeight(10,`VBox( - //`VSpacing(1), - `Bottom(`HBox( - `PushButton(`id(`ok), repair_label ), - `HSpacing(2), - `PushButton(`id(`cancel), Label::CancelButton()) - )))) - )), - `HWeight( 1, `HSpacing(1)) - ); + term contents = `HBox ( + `HWeight (25, `RichText( help_text )), + `HWeight (1, `HSpacing(1)), + `HWeight (60, `VBox ( + `VWeight (headline_box_wight,`VBox ( + `Left (`Heading (headline )), + message_box + )), + `VWeight (hweight, body), + `VWeight (10, `VBox (`Bottom (`HBox ( + `PushButton (`id (`ok), change_label),//repair_label, + `HSpacing(2), + `PushButton (`id (`cancel), skip_label)//Label::CancelButton + )))), + `VSpacing (0.2) + )), + `HWeight (1, `HSpacing(1)) + ); boolean ret = UI::OpenDialog(contents ); UI::SetFocus(`id(`ok)); return ret; Modified: trunk/repair/src/OSRPtbl.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRPtbl.ycp?rev=43308&r1=43307&r2=43308&view=diff ============================================================================== --- trunk/repair/src/OSRPtbl.ycp (original) +++ trunk/repair/src/OSRPtbl.ycp Mon Jan 7 15:38:27 2008 @@ -353,11 +353,11 @@ // %1 is Recover label OSRPopup::build_label_description( OSRPopup::recover_label, sformat(_("Change the status of a partition to %1."), s_recover_label)) + - //%1 is Recover label - OSRPopup::build_label_description( OSRPopup::repair_label, sformat(_("If you have changed the status of all partitions for recovering -to %1, press Repair to execute the recovery process. + //%1 is Change label + OSRPopup::build_label_description( OSRPopup::change_label, sformat(_("If you have changed the status of all partitions for recovering +to %1, press <b>Change</b> to execute the recovery process. "), s_recover_label)) + - + // help_text description for table column, %1 ignore, %2 recover OSRPopup::build_label_description( label_status, sformat(_("The status of a listed partition can be switched between %1 and %2. Only @@ -935,7 +935,7 @@ be deleted to recover another partition.</P> ") + - OSRPopup::build_label_description (OSRPopup::repair_label, + OSRPopup::build_label_description (OSRPopup::change_label, // help text for button _("Start the recovery process.")); Modified: trunk/repair/src/OSRRepairUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRRepairUI.ycp?rev=43308&r1=43307&r2=43308&view=diff ============================================================================== --- trunk/repair/src/OSRRepairUI.ycp (original) +++ trunk/repair/src/OSRRepairUI.ycp Mon Jan 7 15:38:27 2008 @@ -115,8 +115,9 @@ if ( initialized ) return `next; - // Set help text - if (!OSRMode::script) Wizard::RestoreHelp ( "" ); + if (!OSRMode::script) + // init dialog help text + Wizard::RestoreHelp (_("Initializing the system. Please wait...")); // A callback function for abort block<boolean> abort = ``{ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org