Author: aschnell Date: Wed Oct 29 15:12:46 2008 New Revision: 52673 URL: http://svn.opensuse.org/viewcvs/yast?rev=52673&view=rev Log: - special format and mount checks for crypt files Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-dialogs.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=52673&r1=52672&r2=52673&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Oct 29 15:12:46 2008 @@ -2,6 +2,7 @@ Wed Oct 29 14:29:52 CET 2008 - aschnell@suse.de - fixed crypt file setup (bnc #433484) +- special format and mount checks for crypt files ------------------------------------------------------------------- Tue Oct 28 20:14:59 CET 2008 - aschnell@suse.de Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-dialogs.ycp?rev=52673&r1=52672&r2=52673&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Wed Oct 29 15:12:46 2008 @@ -90,6 +90,9 @@ do_format = true; mount = mount_point_proposal; do_mount = mount != ""; + + if (data["type"]:`unknown == `loop) + do_mount = true; } @@ -260,6 +263,29 @@ // TODO: checks + if (data["type"]:`unknown == `loop) + { + if (data["create_file"]:false && !do_format) + { + // error popup + Popup::Error(_("You chose to create the crypt file, but did not specify +that it should be formatted. This does not make sense. + +Also check the format option. +")); + widget = `again; + continue; + } + + if (!do_mount || mount == "") + { + // error popup + Popup::Error(_("Crypt files require a mount point.")); + widget = `again; + continue; + } + } + if (do_mount) { map ret_mp = CheckOkMount(data["device"]:"error", orig_data, data); @@ -646,7 +672,7 @@ // help text string help_text = _("<p>Choose the new size by draging the slider or by entering a numeric value in either input field.</p>"); - + UI::ChangeWidget(`help, `HelpText, help_text); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org