Author: jsuchome Date: Tue Oct 25 09:59:14 2011 New Revision: 66555 URL: http://svn.opensuse.org/viewcvs/yast?rev=66555&view=rev Log: - added UI for disk encryption (fate#312486) - 2.17.46 Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION?rev=66555&r1=66554&r2=66555&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION Tue Oct 25 09:59:14 2011 @@ -1 +1 @@ -2.17.45 +2.17.46 Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes?rev=66555&r1=66554&r2=66555&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes Tue Oct 25 09:59:14 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 18 11:09:57 CEST 2011 - jsuchome@suse.cz + +- added UI for disk encryption (fate#312486) +- 2.17.46 + +------------------------------------------------------------------- Mon Oct 17 14:01:41 CEST 2011 - jsuchome@suse.cz - call SLEPOS specific XSL transformation (bnc#723031) Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp?rev=66555&r1=66554&r2=66555&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp Tue Oct 25 09:59:14 2011 @@ -123,6 +123,54 @@ return nil; } + void InitDiskPassword (string id) { + + string disk_password = ""; + foreach (map typemap, (list<map>)KiwiConfig["preferences",0,"type"]:[], { + if (typemap["image"]:"" == kiwi_task) + { + disk_password = typemap["luks"]:disk_password; + } + }); + UI::ChangeWidget (`id (id), `Value, disk_password); + UI::ChangeWidget (`id (id), `Enabled, disk_password != ""); + UI::ChangeWidget (`id ("encrypt_disk"), `Value, disk_password != ""); + } + + void StoreDiskPassword (string key, map event) { + + string disk_password = (string) UI::QueryWidget (`id (key), `Value); + if (UI::QueryWidget (`id ("encrypt_disk"), `Value) == false) + disk_password = ""; + + KiwiConfig["preferences",0,"type"] = maplist (map typemap, + (list<map>)KiwiConfig["preferences",0,"type"]:[], + { + if (typemap["image"]:"" == kiwi_task) + { + if (disk_password == "") + { + if (haskey (typemap, "luks")) + typemap = remove (typemap, "luks"); + } + else + typemap["luks"] = disk_password; + } + return typemap; + }); + } + + symbol HandleDiskPassword (string key, map event) { + if (event["ID"]:nil == `next) StoreDiskPassword (key, event); + return nil; + } + + symbol HandleEncryptDisk (string key, map event) { + boolean value = (boolean) UI::QueryWidget (`id (key), `Value); + UI::ChangeWidget (`id ("disk_password"), `Enabled, value); + return nil; + } + /** * Initialize the widget with ignored packages */ @@ -1680,6 +1728,13 @@ show_compression ? `HWeight (1, "compression") : `HBox () ), `HBox ( + `VBox ( + `Label (""), + "encrypt_disk" + ), + "disk_password" + ), + `HBox ( `HWeight (2, `VBox ( "sw_selection", `Left (`Label (_("Installed Software"))), @@ -1693,6 +1748,7 @@ "widget_names" : [ "version", "size", "sizeunit", "additive", + "encrypt_disk", "disk_password", "sw_selection", "rt_sw", "configure_sw", "delete_sw", @@ -1888,6 +1944,24 @@ "label" : _("Additive"), "no_help" : true, ], + "encrypt_disk" : $[ + "widget" : `checkbox, + "opt" : [ `notify ], + // check box label + "label" : _("Encrypt Image with LUKS"), + // help text + "help" : _("<p>For creating encrypted file system, check <b>Encrypt Image with LUKS</b> and enter the password.</p>"), + "handle" : HandleEncryptDisk, + ], + "disk_password" : $[ + "widget" : `textentry, + // textentry label + "label" : _("Encrypted Image LUKS Password"), + "init" : InitDiskPassword, + "store" : StoreDiskPassword, + "handle" : HandleDiskPassword, + "no_help" : true, + ], // ---------------- widgtes for directory structure "general_scripts" : $[ "widget" : `empty, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org