Author: aschnell Date: Tue Jun 17 15:03:00 2008 New Revision: 48361 URL: http://svn.opensuse.org/viewcvs/yast?rev=48361&view=rev Log: - backup commit Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp?rev=48361&r1=48360&r2=48361&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp Tue Jun 17 15:03:00 2008 @@ -129,7 +129,7 @@ used_fs = Partitions::DefaultBootFs(); data["format"] = true; - data["fsid"] = Partitions::fsid_native; + data["fsid"] = Partitions::fsid_native; data["mount"] = mount_point_proposal; data["used_fs"] = used_fs; data["fs_options"] = FileSystems::DefaultFormatOptions(data); @@ -242,11 +242,25 @@ if (widget == `next) { + boolean crypt_fs = (boolean) UI::QueryWidget(`id(`crypt_fs), `Value); + + if (crypt_fs) + data["enc_type"] = data["format"]:false ? `luks : `twofish; + else + data["enc_type"] = `none; + + if (UI::QueryWidget(`id(`do_mount), `Value) == true) + data["mount"] = (string) UI::QueryWidget(`id(`mount_point), `Value); + else + data["mount"] = ""; + if (UI::QueryWidget(`id(`do_format), `Value) != true || UI::QueryWidget(`id(`crypt_fs), `Value) != true) widget = `finish; } + Debug("data", data); + y2milestone("MiniWorkflowStepFormatMount data:%1 ret:%2", data, widget); return widget; @@ -342,6 +356,8 @@ if (widget == `next) { data["password"] = (string) UI::QueryWidget(`id(`pw1), `Value); + + widget = `finish; } y2milestone("MiniWorkflowStepPassword data:%1 ret:%2", data, widget); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org