January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60294 - in /trunk/storage/storage/src: include/ep-dialogs.ycp modules/Storage.ycp modules/StorageProposal.ycp
by aschnell＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: aschnell Date: Fri Jan 8 15:52:24 2010 New Revision: 60294 URL: http://svn.opensuse.org/viewcvs/yast?rev=60294&view=rev Log: - use GetFreeInfo instead of GetFreeSpace in IsEfiPartition - removed unused parameter from GetFreeSpace Modified: trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Fri Jan 8 15:52:24 2010 @@ -591,7 +591,7 @@ { if (used_fs != `swap) { - map free_data = Storage::GetFreeSpace(device, 0, used_fs, true); + map free_data = Storage::GetFreeSpace(device, used_fs, true); if (size(free_data) == 0 || !free_data["ok"]:false) { y2error("Failed to retrieve FreeSpace %1, filesystem %2", device, data["used_fs"]:`none); Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Fri Jan 8 15:52:24 2010 @@ -845,7 +845,7 @@ * @param symbol used_fs * @param boolean verbose */ -global map GetFreeSpace(string device, integer testsize, symbol used_fs, boolean verbose) +global map GetFreeSpace(string device, symbol used_fs, boolean verbose) { map<symbol, any> resize_info = $[]; map<symbol, any> content_info = $[]; @@ -2978,14 +2978,24 @@ return( ret ); } -define boolean IsEfiPartition( map p ) + +boolean IsEfiPartition(map p) { - map m = GetFreeSpace( p["device"]:"", 0, p["used_fs"]:`none, false ); - boolean ret = m["efi"]:false; - y2milestone( "IsEfiPartition ret:%1", ret ); - return( ret ); + boolean ret = false; + + map<symbol, any> resize_info = $[]; + map<symbol, any> content_info = $[]; + if (GetFreeInfo(p["device"]:"", false, resize_info, true, content_info, true) && + content_info[`efi]:false) + { + ret = true; } + y2milestone("IsEfiPartition ret:%1", ret); + return ret; + } + + /** * Search in the list partitions for windows partitions and add the key * "mount" to the found windows partitions. Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Fri Jan 8 15:52:24 2010 @@ -329,7 +329,7 @@ if (Partitions::IsDosWinNtPartition(p["fsid"]:0) && contains([ `ntfs, `vfat ], p["used_fs"]:`none)) { - p["winfo"] = Storage::GetFreeSpace(p["device"]:"", 0, + p["winfo"] = Storage::GetFreeSpace(p["device"]:"", p["used_fs"]:`none, false); y2milestone("AddWinInfo %1", p); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60293 - in /branches/SuSE-Code-11-SP1-Branch/storage: libstorage/src/MdCo.cc libstorage/src/MdCo.h package/yast2-storage.changes
by aschnell＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: aschnell Date: Fri Jan 8 15:39:09 2010 New Revision: 60293 URL: http://svn.opensuse.org/viewcvs/yast?rev=60293&view=rev Log: - removed obsolete function Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.h branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.cc Fri Jan 8 15:39:09 2010 @@ -268,14 +268,6 @@ return( findMd( dev, i )); } -unsigned -MdCo::unusedNumber() - { - unsigned i=0; - while( findMd(i) && i<1000 ) - i++; - return( i ); - } int MdCo::usedNumbers(list<int>& nums) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.h Fri Jan 8 15:39:09 2010 @@ -56,11 +56,6 @@ bool equalContent( const Container& rhs ) const; void logDifference( const Container& d ) const; - /* This function is deprecated and should not be used. - * It returns first free 'md' number for Non-partitionable MD RAIDs - * Regardless from Partitionable RAIDs and this can lead to errors. - */ - unsigned unusedNumber(); void syncRaidtab(); void changeDeviceName( const string& old, const string& nw ); Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Fri Jan 8 15:39:09 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 08 15:28:03 CET 2010 - aschnell(a)suse.de + +- fixed numbering of RAIDs (bnc #567662) +- 2.17.87 + +------------------------------------------------------------------- Mon Dec 21 13:03:03 CET 2009 - fehr(a)suse.de - backported crypt related fixes from HEAD -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60292 - in /trunk/storage: bindings/ycp/ package/ storage/src/modules/ storage/src/testsuite/data/reuse-home/ storage/src/testsuite/data/windows-only/
by aschnell＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: aschnell Date: Fri Jan 8 14:56:46 2010 New Revision: 60292 URL: http://svn.opensuse.org/viewcvs/yast?rev=60292&view=rev Log: - delay ntfs resize check until partitioning proposal (bnc #533568) Modified: trunk/storage/bindings/ycp/LibStorage.i trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/testsuite/data/reuse-home/free.info trunk/storage/storage/src/testsuite/data/windows-only/free.info Modified: trunk/storage/bindings/ycp/LibStorage.i URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/bindings/ycp/LibStorage.… ============================================================================== --- trunk/storage/bindings/ycp/LibStorage.i (original) +++ trunk/storage/bindings/ycp/LibStorage.i Fri Jan 8 14:56:46 2010 @@ -41,6 +41,8 @@ specialize_sequence(storage::DmmultipathInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::PartitionSlotInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::CommitInfo, TO_PACK, FROM_PACK, CHECK) +specialize_sequence(storage::ResizeInfo, TO_PACK, FROM_PACK, CHECK) +specialize_sequence(storage::ContentInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::Environment, TO_PACK, FROM_PACK, CHECK) Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Jan 8 14:56:46 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jan 08 14:37:40 CET 2010 - aschnell(a)suse.de + +- delay ntfs resize check until partitioning proposal (bnc #533568) + +------------------------------------------------------------------- Tue Jan 05 16:59:39 CET 2010 - aschnell(a)suse.de - removed unused parameter from function Storage::DeleteDevice Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Fri Jan 8 14:56:46 2010 @@ -68,6 +68,8 @@ import "LibStorage::PartitionSlotInfo"; import "LibStorage::CommitInfo"; import "LibStorage::DlabelCapabilities"; + import "LibStorage::ResizeInfo"; + import "LibStorage::ContentInfo"; import "LibStorage::Environment"; @@ -796,6 +798,45 @@ } +boolean GetFreeInfo(string device, boolean get_resize, map<symbol, any>& resize_info, + boolean get_content, map<symbol, any>& content_info, boolean use_cache) +{ + resize_info = $[]; + content_info = $[]; + + any tmp1 = LibStorage::ResizeInfo::new("LibStorage::ResizeInfo"); + any tmp2 = LibStorage::ContentInfo::new("LibStorage::ContentInfo"); + + boolean ret = LibStorage::StorageInterface::getFreeInfo(sint, device, get_resize, tmp1, + get_content, tmp2, use_cache); + + if (ret) + { + if (get_resize) + { + resize_info = $[ + `df_free_k : LibStorage::ResizeInfo::swig_df_freeK_get(tmp1), + `resize_free_k : LibStorage::ResizeInfo::swig_resize_freeK_get(tmp1), + `used_k : LibStorage::ResizeInfo::swig_usedK_get(tmp1), + `resize_ok : LibStorage::ResizeInfo::swig_resize_ok_get(tmp1) + ]; + } + + if (get_content) + { + content_info = $[ + `windows : LibStorage::ContentInfo::swig_windows_get(tmp2), + `efi : LibStorage::ContentInfo::swig_efi_get(tmp2), + `home : LibStorage::ContentInfo::swig_home_get(tmp2) + ]; + } + } + + y2milestone("GetFreeInfo device:%1 ret:%2", device, ret); + return ret; +} + + /** * Returns map of free space per partition * @@ -806,23 +847,20 @@ */ global map GetFreeSpace(string device, integer testsize, symbol used_fs, boolean verbose) { - integer used = 0; - integer resize_free = 0; - integer df_free = 0; - boolean win_disk = false; - boolean efi = false; - boolean home = false; - - boolean r = false; - r = LibStorage::StorageInterface::getFreeInfo( sint, device, resize_free, - df_free, used, win_disk, - efi, home, used_fs==`ntfs ); - - resize_free = resize_free * 1024; // Byte - df_free = df_free * 1024; // Byte - used = used * 1024; // Byte + map<symbol, any> resize_info = $[]; + map<symbol, any> content_info = $[]; + + boolean r = GetFreeInfo(device, true, resize_info, true, content_info, used_fs == `ntfs); + + integer used = 1024 * resize_info[`used_k]:0; + integer resize_free = 1024 * resize_info[`resize_free_k]:0; + integer df_free = 1024 * resize_info[`df_free_k]:0; + boolean resize_ok = resize_info[`resize_ok]:false; - if( used_fs == `ntfs && !r && verbose ) + boolean win_disk = content_info[`windows]:false; + boolean efi = content_info[`efi]:false; + + if( used_fs == `ntfs && (!r || !resize_ok) && verbose ) { string cmd = sformat("/usr/sbin/ntfsresize -f -i '%1'", device); y2milestone( "GetFreeSpace Executing cmd:%1", cmd ); @@ -3510,17 +3548,14 @@ if( !p["created"]:false && contains( poss_fs, p["detected_fs"]:`unknown ) && !isempty(device) ) { - integer used = 0; - integer resize_free = 0; - integer df_free = 0; - boolean win_disk = false; - boolean efi = false; - boolean home = false; - - if (LibStorage::StorageInterface::getFreeInfo(sint, device, resize_free, - df_free, used, win_disk, - efi, home, true)) - ret = home; + map<symbol, any> resize_info = $[]; + map<symbol, any> content_info = $[]; + + if (GetFreeInfo(device, false, resize_info, true, content_info, true) && + content_info[`home]:false) + { + ret = true; + } } y2milestone("DetectHomeFs device:%1 ret:%2", device, ret); return ret; @@ -4058,8 +4093,6 @@ list<map> GetPrimPartitions(map<string, map> targets, boolean foreign_os) { list<map> ret = []; - map entry = $[]; - string text = ""; integer num_dos = 0; integer num_win = 0; integer num_os2 = 0; @@ -4078,10 +4111,15 @@ SCR::Execute (.target.bash, "/usr/lib/YaST2/bin/check.boot "+device) == 0) { - text = ""; + string text = ""; if( Partitions::IsDosWinNtPartition( part["fsid"]:0 ) && - data["used_by_type"]:`UB_NONE==`UB_NONE && - GetFreeSpace( device, 0, part["used_fs"]:`none, false )["win_disk"]:false ) + data["used_by_type"]:`UB_NONE==`UB_NONE ) + { + map<symbol, any> resize_info = $[]; + map<symbol, any> content_info = $[]; + + if (GetFreeInfo(device, false, resize_info, true, content_info, true) && + content_info[`windows]:false) { if( contains( Partitions::fsid_dostypes, part["fsid"]:0 ) ) { @@ -4094,6 +4132,7 @@ text = win_text; } } + } else if( part["fsid"]:0 == 0x12 && !foreign_os ) { text = "Vendor diagnostic"; @@ -4109,18 +4148,18 @@ text = linux_text; num_linux = num_linux+1; } - if( size(text)>0 ) + if (!isempty(text)) { - entry["device"] = device; - entry["string"] = text; - ret = add( ret, eval(entry) ); - y2milestone( "new entry %1", entry ); + map entry = $[ "device" : device, "text" : text ]; + y2milestone( "new entry %1", entry ); + ret = add(ret, entry); } } }); }); y2milestone( "GetPrimPartitions foreign_os:%5 num_linux %1 num_win %2 num_dos %3 num_os2 %4", num_linux, num_win, num_dos, num_os2, foreign_os ); + integer num = 1; if( num_linux>1 ) { Modified: trunk/storage/storage/src/testsuite/data/reuse-home/free.info URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/reuse-home/free.info (original) +++ trunk/storage/storage/src/testsuite/data/reuse-home/free.info Fri Jan 8 14:56:46 2010 @@ -1 +1 @@ -/dev/sda3 df_free=23338740 resize_free=23338740 used=26203196 windows=0 efi=0 home=1 resize_ok=1 +/dev/sda3 resize_cached=1 df_free=23338740 resize_free=23338740 used=26203196 resize_ok=1 content_cached=1 windows=0 efi=0 home=1 Modified: trunk/storage/storage/src/testsuite/data/windows-only/free.info URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/windows-only/free.info (original) +++ trunk/storage/storage/src/testsuite/data/windows-only/free.info Fri Jan 8 14:56:46 2010 @@ -1 +1 @@ -/dev/sda1 df_free=64991212 resize_free=64991212 used=13156948 windows=1 efi=0 home=0 resize_ok=1 +/dev/sda1 resize_cached=1 df_free=64991212 resize_free=64991212 used=13156948 resize_ok=1 content_cached=1 windows=1 efi=0 home=0 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60291 - /tags/branch-Code-11-SP1-2_17_66/bootloader/
by juhliarik＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: juhliarik Date: Fri Jan 8 14:03:33 2010 New Revision: 60291 URL: http://svn.opensuse.org/viewcvs/yast?rev=60291&view=rev Log: Created tag branch-Code-11-SP1-2_17_66 for bootloader Added: tags/branch-Code-11-SP1-2_17_66/bootloader/ (props changed) - copied from r60290, branches/SuSE-Code-11-SP1-Branch/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60290 - in /branches/SuSE-Code-11-SP1-Branch/bootloader: VERSION package/yast2-bootloader.changes src/routines/lilolike.ycp
by juhliarik＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: juhliarik Date: Fri Jan 8 14:03:26 2010 New Revision: 60290 URL: http://svn.opensuse.org/viewcvs/yast?rev=60290&view=rev Log: added fix for worng Intel MD RAID -> fix data in device.map Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Fri Jan 8 14:03:26 2010 @@ -1 +1 @@ -2.17.65 +2.17.66 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Fri Jan 8 14:03:26 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 7 14:57:34 CET 2010 - juhliarik(a)suse.cz + +- added fix for data in device.map if MD RAID from Intel is used + (bnc#568837) +- 2.17.66 + +------------------------------------------------------------------- Fri Dec 4 12:05:28 CET 2009 - juhliarik(a)suse.cz - added patch for KMS (bnc#560423) -> disable KMS for failsafe Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp Fri Jan 8 14:03:26 2010 @@ -1114,6 +1114,45 @@ return ret; } +/** bnc#568837 wrong data in device map + * Function check if disk is in list of devices + * @param string disk + * @param list<string> list of devices + * @return true if success + */ + +boolean isDiskInList (string disk, list<string> devices) +{ + boolean ret = false; + foreach(string dev, devices, + { + if (dev == disk) + { + ret = true; + break; + } + }); + return ret; +} + +/** bnc#568837 wrong data in device map + * Check if disk is in MDRaid it means completed disk is used in RAID + * @param disk (/dev/sda) + * @param tm - target map + * @return - true if disk (not only part of disk) is in MDRAID + */ +boolean isDiskInMDRaid (string disk, map<string,map> tm) +{ + boolean ret = false; + foreach( string dev, map d_info, tm, + { + if (d_info["type"]:nil == `CT_MDPART) + ret = isDiskInList(disk, d_info["devices"]:[]); + if (ret) + break; + }); + return ret; +} /*** helper functions END ***/ @@ -1148,10 +1187,6 @@ else targetMap = (map<string,map>)Storage::GetTargetMap(); - // filter out members of BIOS RAIDs and multipath devices - targetMap = filter (string k, map v, targetMap, { - return v["used_by_type"]:nil != `UB_DMRAID && v["used_by_type"]:nil != `UB_DMMULTIPATH; - }); // filter out non-disk devices targetMap = filter (string k, map v, targetMap, { return v["type"]:`CT_UNKNOWN==`CT_DMRAID || v["type"]:`CT_UNKNOWN==`CT_DISK @@ -1159,6 +1194,13 @@ (v["type"]:`CT_UNKNOWN==`CT_MDPART && checkMDRaidDevices(v["devices"]:[], targetMap)); }); + // bnc#568837 wrong data in device map + // filter out members of BIOS RAIDs and multipath devices + targetMap = filter (string k, map v, targetMap, { + return v["used_by_type"]:nil != `UB_DMRAID && v["used_by_type"]:nil != `UB_DMMULTIPATH&& + ((v["used_by_type"]:nil == `UB_MDPART) ? (!isDiskInMDRaid(k,targetMap)):true); + }); + y2milestone ("Target map: %1", targetMap); // add devices with known bios_id -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60289 - /tags/branch-Code-11-SP1-2_17_18/kdump/
by juhliarik＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: juhliarik Date: Fri Jan 8 13:58:06 2010 New Revision: 60289 URL: http://svn.opensuse.org/viewcvs/yast?rev=60289&view=rev Log: Created tag branch-Code-11-SP1-2_17_18 for kdump Added: tags/branch-Code-11-SP1-2_17_18/kdump/ (props changed) - copied from r60288, branches/SuSE-Code-11-SP1-Branch/kdump/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60288 - /tags/branch-Code-11-SP1-2_17_18/
by juhliarik＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: juhliarik Date: Fri Jan 8 13:58:05 2010 New Revision: 60288 URL: http://svn.opensuse.org/viewcvs/yast?rev=60288&view=rev Log: Created tag branch-Code-11-SP1-2_17_18 Added: tags/branch-Code-11-SP1-2_17_18/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60287 - in /branches/SuSE-Code-11-SP1-Branch/kdump: VERSION package/yast2-kdump.changes src/Kdump.ycp src/kdump_finish.ycp
by juhliarik＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: juhliarik Date: Fri Jan 8 13:57:53 2010 New Revision: 60287 URL: http://svn.opensuse.org/viewcvs/yast?rev=60287&view=rev Log: added fix for deleting offset for crashkernel value Modified: branches/SuSE-Code-11-SP1-Branch/kdump/VERSION branches/SuSE-Code-11-SP1-Branch/kdump/package/yast2-kdump.changes branches/SuSE-Code-11-SP1-Branch/kdump/src/Kdump.ycp branches/SuSE-Code-11-SP1-Branch/kdump/src/kdump_finish.ycp Modified: branches/SuSE-Code-11-SP1-Branch/kdump/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/kdump… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/kdump/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/kdump/VERSION Fri Jan 8 13:57:53 2010 @@ -1 +1 @@ -2.17.17 +2.17.18 Modified: branches/SuSE-Code-11-SP1-Branch/kdump/package/yast2-kdump.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/kdump… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/kdump/package/yast2-kdump.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/kdump/package/yast2-kdump.changes Fri Jan 8 13:57:53 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 7 15:22:05 CET 2010 - juhliarik(a)suse.cz + +- deleted offset "@16M" from crashkernel option (bnc#565122) and + (bnc#563905) +- 2.17.18 + +------------------------------------------------------------------- Tue Nov 10 11:47:35 CET 2009 - juhliarik(a)suse.cz - disbaled kdump in YaST on s390 (bnc#524164) Modified: branches/SuSE-Code-11-SP1-Branch/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/kdump… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/kdump/src/Kdump.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/kdump/src/Kdump.ycp Fri Jan 8 13:57:53 2010 @@ -364,7 +364,24 @@ string result = ""; string kernel_boot_options = ""; integer min_dif_size = 1000; - + + if (Mode::update()) + { + result = Bootloader::getDefaultSection (); + integer section_position = -1; + foreach(map section, BootCommon::sections, + { + section_position = section_position +1; + string name = tostring(section["name"]:nil); + + if ((name == result) && (section["xen_append"]:nil != nil)) + { + section_pos = section_position; + kernel_version = "xen"; + } + }); + return result; + } // reading bootloader settings boolean old_progress = Progress::set (false); Bootloader::Read(); @@ -539,11 +556,9 @@ string crash_value = ""; crash_value = alocated_memory+"M"; - if ((Arch::i386()) ||(Arch::x86_64())) { - crash_value = crash_value + "@16M"; - y2milestone("Common offset 16M"); - } else if ((Arch::ia64()) || Arch::ppc64()) { - y2milestone("ia64 or ppc64 platform without offset"); + // bnc#563905 problem with offset in crashkernel + if ((Arch::i386()) ||(Arch::x86_64()) || (Arch::ia64()) || Arch::ppc64()) { + y2milestone("i386, x86_64, ia64 and ppc64 platforms are without offset"); } else { if (Mode::normal()) Popup::Error(_("Unsupported architecture, \"crashkernel\" was not added")); @@ -574,8 +589,9 @@ { crash_value = getAlocatedMemory(crash)+"M"; - if ((Arch::i386()) ||(Arch::x86_64()) || Arch::ppc64()) - crash_value = crash_value + "@16M"; + // bnc#563905 problem with offset in crashkernel + //if ((Arch::i386()) ||(Arch::x86_64()) || Arch::ppc64()) + // crash_value = crash_value + "@16M"; } y2milestone("Converting crashkernel value from: (%1) to :(%2)",crash, crash_value); @@ -945,6 +961,17 @@ if (Mode::autoinst()) crash_value = crashkernel_param_value; + + + if (Mode::update()) + { + if (search(crash_value, "@") != nil) + { + list<string> tmp_crash_value = splitstring(crash_value, "@"); + crash_value = tmp_crash_value[0]:""; + y2milestone("Delete offset crashkernel value: %1", crash_value); + } + } // write crashkernel option to boot section if (section_pos == -1) { @@ -1054,6 +1081,19 @@ } /** + * Update crashkernel argument during update of OS + * @return true on success + */ + +global boolean Update() +{ + y2milestone("Update kdump settings"); + ReadKdumpKernelParam (); + WriteKdumpBootParameter (); + return true; +} + +/** * Write all kdump settings * @return true on success */ Modified: branches/SuSE-Code-11-SP1-Branch/kdump/src/kdump_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/kdump… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/kdump/src/kdump_finish.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/kdump/src/kdump_finish.ycp Fri Jan 8 13:57:53 2010 @@ -50,7 +50,11 @@ // propose settings for kdump if autoyast doesn't include settings for yast2-kdump if ((!Kdump::import_called) && (Mode::autoinst())) Kdump::Propose(); - Kdump::Write(); + + if (Mode::update()) + Kdump::Update(); + else + Kdump::Write(); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60286 - /tags/stable-2_19_6/country/
by jsuchome＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: jsuchome Date: Fri Jan 8 10:14:32 2010 New Revision: 60286 URL: http://svn.opensuse.org/viewcvs/yast?rev=60286&view=rev Log: Created tag stable-2_19_6 for country Added: tags/stable-2_19_6/country/ - copied from r60285, trunk/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60285 - in /trunk/country: VERSION keyboard/src/Makefile.am package/yast2-country.changes
by jsuchome＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: jsuchome Date: Fri Jan 8 10:14:27 2010 New Revision: 60285 URL: http://svn.opensuse.org/viewcvs/yast?rev=60285&view=rev Log: - package keyboard desktop file - 2.19.6 Modified: trunk/country/VERSION trunk/country/keyboard/src/Makefile.am trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=60285&r1=602… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Fri Jan 8 10:14:27 2010 @@ -1 +1 @@ -2.19.5 +2.19.6 Modified: trunk/country/keyboard/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/keyboard/src/Makefile.am… ============================================================================== --- trunk/country/keyboard/src/Makefile.am (original) +++ trunk/country/keyboard/src/Makefile.am Fri Jan 8 10:14:27 2010 @@ -15,6 +15,10 @@ rnc_DATA = keyboard.rnc -EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(rnc_DATA) +desktop_DATA = \ + keyboard.desktop + + +EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(rnc_DATA) $(desktop_DATA) include $(top_srcdir)/Makefile.am.common Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Fri Jan 8 10:14:27 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 8 10:09:52 CET 2010 - jsuchome(a)suse.cz + +- package keyboard desktop file +- 2.19.6 + +------------------------------------------------------------------- Thu Jan 7 14:40:33 CET 2010 - jsuchome(a)suse.cz - added Language::SwitchToEnglishIfNeeded to be called when it might -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0