[yast-commit] r48960 - /branches/tmp/aschnell/part-redesign/storage/src/include/

Author: aschnell Date: Thu Jul 10 13:45:58 2008 New Revision: 48960 URL: http://svn.opensuse.org/viewcvs/yast?rev=48960&view=rev Log: - work on mount point editing Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm-lib.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.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=48960&r1=48959&r2=48960&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 Thu Jul 10 13:45:58 2008 @@ -230,15 +230,15 @@ symbol flavour = data["flavour"]:`none; - - boolean do_format = data["format"]:true; + boolean do_format = data["format"]:false; boolean crypt_fs = false; // TODO string mount = data["mount"]:""; boolean do_mount = mount != ""; - - if (!haskey(data, "format")) + if (data["new"]:false && !data["formatmount_proposed"]:false) { + data["formatmount_proposed"] = true; + string mount_point_proposal = GetMountPointProposal(Storage::GetTargetMap(), []); symbol used_fs = Partitions::DefaultFs(); @@ -262,7 +262,7 @@ if (mountpoints == nil) mountpoints = [ "/", "/usr", Partitions::BootMount(), "/var", "/home", "/opt" ]; - if (!contains(mountpoints, mount)) + if (mount != "" && !contains(mountpoints, mount)) mountpoints = union([mount], mountpoints); term contents = `HVSquash(`VStackFrames( @@ -386,8 +386,6 @@ widget = `finish; } - Debug("data", data); - y2milestone("MiniWorkflowStepFormatMount data:%1 ret:%2", data, widget); return widget; Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm-dialogs.ycp?rev=48960&r1=48959&r2=48960&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm-dialogs.ycp Thu Jul 10 13:45:58 2008 @@ -8,13 +8,11 @@ textdomain "storage"; - boolean DlgEditDmVolume(string device) + boolean DlgEditDmVolume(map &data) { - map data = $[ "flavour" : `dm ]; - - map target_map = Storage::GetTargetMap(); - data = Storage::GetPartition(target_map, device); - data["format"] = false; + string device = data["device"]:"error"; + + data["flavour"] = `dm; map aliases = $[ "FormatMount" : ``(MiniWorkflowStepFormatMount(data)), Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm-lib.ycp?rev=48960&r1=48959&r2=48960&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm-lib.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm-lib.ycp Thu Jul 10 13:45:58 2008 @@ -16,8 +16,13 @@ return; } - if (DlgEditDmVolume(device)) + map target_map = Storage::GetTargetMap(); + map data = Storage::GetPartition(target_map, device); + + if (DlgEditDmVolume(data)) { + Storage::ChangeVolumeProperties(data); + UpdateNavigationTree(nil); TreePanel::Create(); } Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp?rev=48960&r1=48959&r2=48960&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp Thu Jul 10 13:45:58 2008 @@ -124,13 +124,9 @@ } - boolean DlgEditPartition(string device) + boolean DlgEditPartition(map &data) { - map data = $[]; - - map target_map = Storage::GetTargetMap(); - data = Storage::GetPartition(target_map, device); - data["format"] = false; + string device = data["device"]:"error"; map aliases = $[ "FormatMount" : ``(MiniWorkflowStepFormatMount(data)), Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp?rev=48960&r1=48959&r2=48960&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp Thu Jul 10 13:45:58 2008 @@ -120,7 +120,9 @@ if (size(slots) > 0) { - map data = $[ "disk_device" : disk_device, + map data = $[ "new" : true, + "create" : true, + "disk_device" : disk_device, "cyl_size" : disk["cyl_size"]:0, "slots" : slots ]; @@ -151,8 +153,13 @@ return; } - if (DlgEditPartition(device)) + map target_map = Storage::GetTargetMap(); + map data = Storage::GetPartition(target_map, device); + + if (DlgEditPartition(data)) { + Storage::ChangeVolumeProperties(data); + UpdateNavigationTree(nil); TreePanel::Create(); } Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp?rev=48960&r1=48959&r2=48960&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp Thu Jul 10 13:45:58 2008 @@ -332,7 +332,8 @@ { map target_map = Storage::GetTargetMap(); - map data = $[]; + map data = $[ "new" : true, + "create" : true ]; data["flavour"] = `lv; data["vg_name"] = substring(device, 5); @@ -369,13 +370,11 @@ } - boolean DlgEditLogicalVolume(string device) + boolean DlgEditLogicalVolume(map &data) { - map data = $[ "flavour" : `lv ]; + string device = data["device"]:"error"; - map target_map = Storage::GetTargetMap(); - data = Storage::GetPartition(target_map, device); - data["format"] = false; + data["flavour"] = `lv; map aliases = $[ "FormatMount" : ``(MiniWorkflowStepFormatMount(data)), Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp?rev=48960&r1=48959&r2=48960&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp Thu Jul 10 13:45:58 2008 @@ -99,8 +99,13 @@ return; } - if (DlgEditLogicalVolume(device)) + map target_map = Storage::GetTargetMap(); + map data = Storage::GetPartition(target_map, device); + + if (DlgEditLogicalVolume(data)) { + Storage::ChangeVolumeProperties(data); + UpdateNavigationTree(nil); TreePanel::Create(); } Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp?rev=48960&r1=48959&r2=48960&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp Thu Jul 10 13:45:58 2008 @@ -244,7 +244,8 @@ void DlgCreateRaidNew() { - map data = $[]; + map data = $[ "new" : true, + "create" : true ]; map r = Storage::NextMd(); data["device"] = r["device"]:""; @@ -325,12 +326,10 @@ } - boolean DlgEditRaid(string device) + boolean DlgEditRaid(map &data) { - map target_map = Storage::GetTargetMap(); - map data = Storage::GetPartition(target_map, device); + string device = data["device"]:"error"; - data["format"] = false; data["flavour"] = `raid; map aliases = $[ Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp?rev=48960&r1=48959&r2=48960&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp Thu Jul 10 13:45:58 2008 @@ -31,8 +31,13 @@ return; } - if (DlgEditRaid(device)) + map target_map = Storage::GetTargetMap(); + map data = Storage::GetPartition(target_map, device); + + if (DlgEditRaid(data)) { + Storage::ChangeVolumeProperties(data); + UpdateNavigationTree(nil); TreePanel::Create(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org