Author: aschnell Date: Wed Jan 28 14:20:37 2009 New Revision: 55109 URL: http://svn.opensuse.org/viewcvs/yast?rev=55109&view=rev Log: - merged SuSE-Code-11 branch to trunk Modified: trunk/storage/ (props changed) trunk/storage/VERSION trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/DmPart.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_lib.ycp trunk/storage/storage/src/include/do_proposal_flexible.ycp trunk/storage/storage/src/include/ep-all.ycp trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-hd.ycp trunk/storage/storage/src/include/ep-loop.ycp trunk/storage/storage/src/include/ep-lvm.ycp trunk/storage/storage/src/include/ep-nfs.ycp trunk/storage/storage/src/include/ep-raid.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=55109&r1=55108&r2=55109&view=diff ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Wed Jan 28 14:20:37 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?rev=55109&r1=55108&r2=55109&view=diff ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Wed Jan 28 14:20:37 2009 @@ -841,22 +841,16 @@ "of partitions that the kernel driver of the disk can handle is %3$lu.\n" "Partitions numbered above %3$lu cannot be accessed."), (char*)dev.c_str(), range_exceed, range-1 ); - if( dev.find( "/dev/sd" )==0 ) - { - txt += "\n"; - txt += - // popup text -_("openSUSE is switching to the new IDE drivers using the libata\n" -"modules. These do only support partitions with up to 15\n" -"partitions. You have the following options with openSUSE 10.3:\n" -" - Use the old IDE drivers: Boot again and add\n" -" \'hwprobe=-modules.pata\' as argument to the kernel\n" -" - Repartition your system so that maximal 15 partitions are used.\n" -" To repartition, use your existing operating system.\n" + txt += "\n"; + txt += + // popup text +_("You have the following options:\n" +" - Repartition your system so that only the maximal allowed number\n" +" of partitions is used. To repartition, use your existing operating\n" +" system.\n" " - Use LVM since it can provide an arbitrary and flexible\n" " number of block devices partitions. This needs a repartition\n" " as well."); - } getStorage()->addInfoPopupText( dev, txt ); } for( list::iterator i=pl.begin(); i!=pl.end(); ++i ) Modified: trunk/storage/libstorage/src/DmPart.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPart.cc?rev=55109&r1=55108&r2=55109&view=diff ============================================================================== --- trunk/storage/libstorage/src/DmPart.cc (original) +++ trunk/storage/libstorage/src/DmPart.cc Wed Jan 28 14:20:37 2009 @@ -102,7 +102,7 @@ static string udevCompleteIdPath( const string& s, unsigned nr ) { - return( "/dev/disk/by-id/" + s + "_part" + decString(nr) ); + return( "/dev/disk/by-id/" + s + "-part" + decString(nr) ); } Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=55109&r1=55108&r2=55109&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Wed Jan 28 14:20:37 2009 @@ -207,8 +207,11 @@ if( instsys() ) { DmraidCo::activate( true ); + waitForDevice(); MdCo::activate( true, tmpDir() ); + waitForDevice(); LvmVg::activate( true ); + waitForDevice(); delete ppart; ppart = new ProcPart; } Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=55109&r1=55108&r2=55109&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Jan 28 14:20:37 2009 @@ -1,14 +1,31 @@ ------------------------------------------------------------------- Tue Jan 27 10:38:28 CET 2009 - aschnell@suse.de -- make "Installation Summary" directly accessible in expert +- make "Installation Summary" directly accessible in expert partitioner +- 2.18.2 + +------------------------------------------------------------------- + +Mon Jan 26 12:22:36 CET 2009 - aschnell@suse.de + +- fixed udev partition postfix for dm based devices (bnc #468786) + +------------------------------------------------------------------- +Mon Jan 19 11:32:44 CET 2009 - aschnell@suse.de + +- wait for udev after activating dmraid (bnc #459032) + +------------------------------------------------------------------- +Fri Jan 16 16:37:04 CET 2009 - kmachalkova@suse.cz + +- Equal length of passwd input fields (#465367) ------------------------------------------------------------------- Fri Jan 16 13:56:03 CET 2009 - kmachalkova@suse.cz - Display logical volume name in dialog captions in adding logical - volume workflow (bnc#432952) + volume workflow (bnc#432952) ------------------------------------------------------------------- Wed Jan 14 16:50:42 CET 2009 - aschnell@suse.de @@ -17,6 +34,11 @@ - 2.18.1 ------------------------------------------------------------------- +Thu Jan 08 12:28:35 CET 2009 - aschnell@suse.de + +- report error for invalid mount point (bnc #464354) + +------------------------------------------------------------------- Fri Dec 19 18:48:45 CET 2008 - aschnell@suse.de - redesigned resize dialog (bnc #456816 and #456816) @@ -36,6 +58,35 @@ - 2.18.0 ------------------------------------------------------------------- +Fri Dec 19 11:50:11 CET 2008 - aschnell@suse.de + +- don't check swap partitions on disks used by BIOS RAID or + DM Multipath (bnc #460081) + +------------------------------------------------------------------- +Thu Dec 18 11:13:48 CET 2008 - kmachalkova@suse.cz + +- Usability improvements (added F-key bindings, focusing convenient + widgets where appropriate, pointing out widgets with invalid data) +- Suggest max size for extended partitions, custom size/region for + the rest (bnc#428337) +- Enforce specifying mountpoint if the user wants to mount the + partition (bnc#441130) + +------------------------------------------------------------------- +Wed Dec 17 14:36:26 CET 2008 - aschnell@suse.de + +- fixed accepting expert partitioner status after "Import Mount + Points" (bnc #453746) + +------------------------------------------------------------------- +Tue Dec 16 10:40:10 CET 2008 - aschnell@suse.de + +- start yast2-multipath in running system if available (bnc + #459073) +- fixed popup message (bnc #458972) + +------------------------------------------------------------------- Thu Dec 11 16:37:11 CET 2008 - aschnell@suse.de - fixed reading of udev links for cciss devices (bnc #449110) @@ -44,7 +95,7 @@ ------------------------------------------------------------------- Thu Dec 11 16:19:03 CET 2008 - kmachalkova@suse.cz -- If the test mount of NFS share fails, ask the user whether to +- If the test mount of NFS share fails, ask the user whether to save it anyway to allow correcting possible errors (bnc#450060) - Handle NFS share renaming (changing name of NFS server) Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_lib.ycp?rev=55109&r1=55108&r2=55109&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Wed Jan 28 14:20:37 2009 @@ -382,7 +382,8 @@ if (mount == "") { - allowed = true; + Popup::Error(_("Mount point must not be empty.")); + allowed = false; } else if (used_fs == `swap && mount != "swap") { @@ -507,10 +508,9 @@ map ret = $[]; ret["ok"] = true; new["mount"] = UI::QueryWidget(`id(`mount_point), `Value); - new["mount"] = deletechars( new["mount"]:"", " \t" ); if( old["mount"]:"" != new["mount"]:"" ) new["inactive"] = true; - if( ret["ok"]:false && size(new["mount"]:"")>0 ) + if( ret["ok"]:false ) { boolean crypt_fs = false; if( !check_mount_point( Storage::GetTargetMap(), dev, new )) Modified: trunk/storage/storage/src/include/do_proposal_flexible.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/do_proposal_flexible.ycp?rev=55109&r1=55108&r2=55109&view=diff ============================================================================== --- trunk/storage/storage/src/include/do_proposal_flexible.ycp (original) +++ trunk/storage/storage/src/include/do_proposal_flexible.ycp Wed Jan 28 14:20:37 2009 @@ -81,25 +81,27 @@ map swapable = $[]; -define void flex_init_swapable( map tg ) - ``{ +void flex_init_swapable( map tg ) +{ swapable = $[]; list swaps = Storage::SwappingPartitions(); - foreach( string dev, map disk, tg, - ``{ - list<map> sw = filter( map p, disk["partitions"]:[], - ``(p["type"]:`unknown!=`extended && - !p["delete"]:false && - p["detected_fs"]:`unknown==`swap)); - sw = filter( map p, sw, ``(contains( swaps, p["device"]:"" )|| - Storage::CheckSwapable(p["device"]:""))); - foreach( map p, sw, - ``{ - swapable[p["device"]:""] = true; + foreach(string dev, map disk, tg, { + if (disk["used_by_type"]:`UB_NONE == `UB_NONE) + { + list<map> sw = filter(map p, disk["partitions"]:[], + ``(p["type"]:`unknown!=`extended && + !p["delete"]:false && + p["detected_fs"]:`unknown==`swap)); + sw = filter(map p, sw, ``(contains(swaps, p["device"]:"") || + Storage::CheckSwapable(p["device"]:""))); + foreach(map p, sw, { + swapable[p["device"]:""] = true; }); - }); - y2milestone( "flex_init_swapable %1", swapable ); - } + } + }); + y2milestone("flex_init_swapable %1", swapable); +} + define boolean check_swapable( string dev ) { Modified: trunk/storage/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-all.ycp?rev=55109&r1=55108&r2=55109&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-all.ycp (original) +++ trunk/storage/storage/src/include/ep-all.ycp Wed Jan 28 14:20:37 2009 @@ -70,7 +70,6 @@ { case `import: ImportMountPoints(); - Storage::CreateTargetBackup("expert-partitioner"); UpdateMainStatus(); UpdateNavigationTree(nil); 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=55109&r1=55108&r2=55109&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Wed Jan 28 14:20:37 2009 @@ -296,17 +296,21 @@ mount = (string) UI::QueryWidget(`id(`mount_point), `Value); // TODO: checks - + //crypt-file specific checks if (data["type"]:`unknown == `loop) { + //is encrypt fs checked? if (!crypt_fs) { // error popup Popup::Error(_("Crypt files must be encrypted.")); + UI::ChangeWidget(`id(`crypt_fs), `Value, true); + UI::SetFocus(`id(`crypt_fs)); widget = `again; continue; } + //enforce formatting the crypt-file if (data["create_file"]:false && !do_format) { // error popup @@ -315,14 +319,20 @@ Also check the format option. ")); + UI::ChangeWidget(`id(`do_format), `Value, true); + UI::ChangeWidget(`id(`do_format_attachment), `Enabled, true); + UI::SetFocus(`id(`fs)); widget = `again; continue; } - - if (!do_mount || mount == "") + //enforce specifying mountpoint + if (!do_mount) { // error popup Popup::Error(_("Crypt files require a mount point.")); + UI::ChangeWidget(`id(`do_mount), `Value, true); + UI::ChangeWidget(`id(`do_mount_attachment), `Enabled, true); + UI::SetFocus(`id(`mount_point)); widget = `again; continue; } @@ -455,11 +465,11 @@ term contents = `HVSquash(`FrameWithMarginBox(_("Password"), `VBox( - `Password(`id(`pw1), + `Password(`id(`pw1), `opt(`hstretch), // Label: get password for user root // Please use newline if label is longer than 40 characters _("&Enter a password for your file system:"), ""), - `Password(`id(`pw2), + `Password(`id(`pw2), `opt(`hstretch), // Label: get same password again for verification // Please use newline if label is longer than 40 characters _("Reenter the password for &verification:"), ""), @@ -477,11 +487,12 @@ symbol widget = nil; + //don't put those inside the loop - they'd be reset after each unsuccesful try + UI::ChangeWidget(`id(`pw1), `Value, ""); + UI::ChangeWidget(`id(`pw2), `Value, ""); + repeat { - UI::ChangeWidget(`id(`pw1), `Value, ""); - UI::ChangeWidget(`id(`pw2), `Value, ""); - widget = MiniWorkflow::UserInput(); if (widget == `next) @@ -493,6 +504,7 @@ { // popup text Popup::Message(_("The first and the second version\nof the password do not match!\nPlease try again.")); + UI::SetFocus(`id(`pw1) ); widget = `again; } else if (pw1 == "" && !empty_pw_allowed) @@ -501,6 +513,7 @@ Popup::Message(_("You did not enter a password. Try again. ")); + UI::SetFocus(`id(`pw1) ); widget = `again; } else if (size(pw1) < min_pw_len && !empty_pw_allowed) @@ -509,6 +522,7 @@ Popup::Message(sformat(_("The password must have at least %1 characters. Try again. "), min_pw_len)); + UI::SetFocus(`id(`pw1) ); widget = `again; } else if (size(pw1) >= min_pw_len || empty_pw_allowed) @@ -520,6 +534,7 @@ Popup::Message(_("The password may only contain the following characters: 0..9, a..z, A..Z, and any of \"@#* ,.;:._-+!$%&/|\?{[()]}^\\<>\". Try again.")); + UI::SetFocus(`id(`pw1) ); widget = `again; } } Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-hd-dialogs.ycp?rev=55109&r1=55108&r2=55109&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Wed Jan 28 14:20:37 2009 @@ -105,7 +105,19 @@ integer min_size_k = tointeger(float::ceil(cyl_size / 1024.0)); integer max_size_k = (slot[1]:0 * cyl_size) / 1024; - symbol what = (region == slot) ? `max_size : `manual_region; + symbol type = data["type"]:`unknown; + symbol what = `nothing; // ;-) + + //prefer max size for extended partition (#428337) + //cascaded triple operators would do, but this is more readable + if (region == slot) + { + what = (type == `extended) ? `max_size: `manual_size; + } + else + { + what = `manual_region; + } term contents = `HVSquash( // frame heading @@ -134,9 +146,10 @@ )); MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepPartitionSizeHelptext()); - MiniWorkflow::SetLastStep(data["type"]:`unknown == `extended); + MiniWorkflow::SetLastStep( type == `extended); UI::ChangeWidget(`id(`size), `Value, what); + UI::SetFocus(`id(what)); UI::ChangeWidget(`id(`manual_size_attachment), `Enabled, what == `manual_size); UI::ChangeWidget(`id(`size_input), `Value, Storage::KByteToHumanString(size_k)); UI::ChangeWidget(`id(`manual_region_attachment), `Enabled, what == `manual_region); @@ -157,11 +170,13 @@ case `manual_size: UI::ChangeWidget(`id(`manual_size_attachment), `Enabled, true); UI::ChangeWidget(`id(`manual_region_attachment), `Enabled, false); + UI::SetFocus(`id(`size_input)); break; case `manual_region: UI::ChangeWidget(`id(`manual_size_attachment), `Enabled, false); UI::ChangeWidget(`id(`manual_region_attachment), `Enabled, true); + UI::SetFocus(`id(`end_cyl)); // or `start_cyl, who cares break; case `next: @@ -178,6 +193,7 @@ Popup::Error(sformat(_("The size entered is invalid. Enter a value like \"%1\" or \"%2\"."), Storage::KByteToHumanString(500*1024), Storage::KByteToHumanString(1024*1024))); + UI::SetFocus(`id(`size_input)); widget = `again; continue; } @@ -187,6 +203,7 @@ Popup::Error(sformat(_("The size entered is invalid. Enter a size between %1 and %2."), Storage::KByteToHumanString(min_size_k), Storage::KByteToHumanString(max_size_k))); + UI::SetFocus(`id(`size_input)); widget = `again; continue; } @@ -207,6 +224,7 @@ { // error popup Popup::Error(_("The region entered is invalid.")); + UI::SetFocus(`id(`end_cyl)); widget = `again; continue; } Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-hd.ycp?rev=55109&r1=55108&r2=55109&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Wed Jan 28 14:20:37 2009 @@ -154,7 +154,8 @@ break; case `multipath: - if (ProductFeatures::GetBooleanFeature("partitioning", "use_separate_multipath_module") == true) + if ((ProductFeatures::GetBooleanFeature("partitioning", "use_separate_multipath_module") == true) || + (Mode::normal() && WFM::ClientExists("multipath"))) // popup text CallConfig(_("Calling Multipath configuration cancels all current changes. Really call Multipath configuration?"), ["yast2-multipath"], "multipath"); @@ -354,6 +355,7 @@ EpDasdfmtDisk(disk_device); break; } + UI::SetFocus(`id(`table)); } @@ -490,5 +492,6 @@ EpDeletePartition(part_device); break; } + UI::SetFocus(`id(`text)); } } Modified: trunk/storage/storage/src/include/ep-loop.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-loop.ycp?rev=55109&r1=55108&r2=55109&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-loop.ycp (original) +++ trunk/storage/storage/src/include/ep-loop.ycp Wed Jan 28 14:20:37 2009 @@ -59,6 +59,7 @@ EpCreateLoop(); break; } + UI::SetFocus(`id(`table)); } @@ -110,5 +111,6 @@ EpDeleteLoop(part_device); break; } + UI::SetFocus(`id(`text)); } } Modified: trunk/storage/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-lvm.ycp?rev=55109&r1=55108&r2=55109&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-lvm.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm.ycp Wed Jan 28 14:20:37 2009 @@ -60,6 +60,7 @@ EpCreateVolumeGroup(); break; } + UI::SetFocus(`id(`table)); } @@ -108,6 +109,7 @@ EpDeleteVolumeGroup(device); break; } + UI::SetFocus(`id(`text)); } @@ -178,6 +180,7 @@ EpDeleteLogicalVolume(lv_device); break; } + UI::SetFocus(`id(`table)); } Modified: trunk/storage/storage/src/include/ep-nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-nfs.ycp?rev=55109&r1=55108&r2=55109&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-nfs.ycp (original) +++ trunk/storage/storage/src/include/ep-nfs.ycp Wed Jan 28 14:20:37 2009 @@ -197,6 +197,7 @@ default: break; } + UI::SetFocus(`id(`fstable)); UpdateMainStatus(); } //FIXME: Take care that non-fstab settings of nfs-client Modified: trunk/storage/storage/src/include/ep-raid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-raid.ycp?rev=55109&r1=55108&r2=55109&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-raid.ycp (original) +++ trunk/storage/storage/src/include/ep-raid.ycp Wed Jan 28 14:20:37 2009 @@ -60,6 +60,7 @@ EpCreateRaid(); break; } + UI::SetFocus(`id(`table)); } @@ -117,6 +118,7 @@ EpDeleteRaid(device); break; } + UI::SetFocus(`id(`text)); } Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=55109&r1=55108&r2=55109&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Jan 28 14:20:37 2009 @@ -3314,7 +3314,6 @@ global define boolean CheckSwapable( string dev ) { string cmd = "swapon " + dev; - RemoveDmMapsTo( dev ); boolean ok = (integer)SCR::Execute(.target.bash, cmd )==0; if( ok ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org