October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41372 - /branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.h
by fehr＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: fehr Date: Thu Oct 11 14:06:11 2007 New Revision: 41372 URL: http://svn.opensuse.org/viewcvs/yast?rev=41372&view=rev Log: add missing const declarator Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.h Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.h (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.h Thu Oct 11 14:06:11 2007 @@ -159,7 +159,7 @@ void handleLogFile( const string& name ); static bool testFilesEqual( const string& n1, const string& n2 ); void printInfo( std::ostream& str ); - void logCo( Container* c ); + void logCo( Container* c ) const; void logCo( const string& device ); void logProcData( const string& l="" ); storage::UsedByType usedBy( const string& dev ); -- 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] r41371 - in /branches/SuSE-SLE-10-SP1-Branch/storage: VERSION package/yast2-storage.changes
by fehr＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: fehr Date: Thu Oct 11 13:40:26 2007 New Revision: 41371 URL: http://svn.opensuse.org/viewcvs/yast?rev=41371&view=rev Log: version 2.13.95 Modified: branches/SuSE-SLE-10-SP1-Branch/storage/VERSION branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-SLE-10-SP1-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/VERSION Thu Oct 11 13:40:26 2007 @@ -1 +1 @@ -2.13.94 +2.13.95 Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Thu Oct 11 13:40:26 2007 @@ -12,6 +12,7 @@ - fix missing initialisation of tmpcrypt (#307219) - fix case of nonzero passno for encrypted fstab entries (#307221) - fix problem with resizing encrypted volumes (#307219) +- version 2.13.95 ------------------------------------------------------------------- Mon Oct 8 10:49:37 CEST 2007 - fehr(a)suse.de -- 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] r41370 - in /branches/SuSE-SLE-10-SP1-Branch/storage: libstorage/src/EtcFstab.h package/yast2-storage.changes
by fehr＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: fehr Date: Thu Oct 11 13:39:33 2007 New Revision: 41370 URL: http://svn.opensuse.org/viewcvs/yast?rev=41370&view=rev Log: fix problem with resizing encrypted volumes (#307219) Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/EtcFstab.h branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/EtcFstab.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/EtcFstab.h (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/EtcFstab.h Thu Oct 11 13:39:33 2007 @@ -16,7 +16,8 @@ struct FstabEntry { - FstabEntry() { freq=passno=0; crypto=cryptt=loop=noauto=dmcrypt=false; + FstabEntry() { freq=passno=0; + crypto=cryptt=loop=noauto=dmcrypt=tmpcrypt=false; encr=storage::ENC_NONE; mount_by=storage::MOUNTBY_DEVICE; } FstabEntry& operator=( const FstabChange& rhs ); friend std::ostream& operator<< (std::ostream& s, const FstabEntry &v ); Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Thu Oct 11 13:39:33 2007 @@ -11,6 +11,7 @@ - improve discrimination between EFI and win partitions (#287289) - fix missing initialisation of tmpcrypt (#307219) - fix case of nonzero passno for encrypted fstab entries (#307221) +- fix problem with resizing encrypted volumes (#307219) ------------------------------------------------------------------- Mon Oct 8 10:49:37 CEST 2007 - fehr(a)suse.de -- 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] r41369 - in /branches/SuSE-SLE-10-SP1-Branch/storage: libstorage/src/Volume.cc package/yast2-storage.changes
by fehr＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: fehr Date: Thu Oct 11 13:33:19 2007 New Revision: 41369 URL: http://svn.opensuse.org/viewcvs/yast?rev=41369&view=rev Log: - fix missing initialisation of tmpcrypt (#307219) - fix case of nonzero passno for encrypted fstab entries (#307221) Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Volume.cc branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Volume.cc Thu Oct 11 13:33:19 2007 @@ -1114,11 +1114,17 @@ int Volume::resizeFs() { + SystemCmd c; + string cmd; int ret = 0; + if( encryption!=ENC_NONE && !dmcrypt_dev.empty() ) + { + cmd = "cryptsetup resize "; + cmd += dmcrypt_dev.substr(dmcrypt_dev.rfind( '/' )+1); + c.execute( cmd ); + } if( !format && !ignore_fs ) { - string cmd; - SystemCmd c; switch( fs ) { case SWAP: @@ -2249,7 +2255,7 @@ { changed = true; che.fs = fs_names[fs]; - if( fs==SWAP ) + if( fs==SWAP || encryption!=ENC_NONE ) che.freq = che.passno = 0; else { @@ -2264,6 +2270,13 @@ if( !dmcrypt() ) che.loop_dev = fstab_loop_dev; che.dentry = de; + if( encryption!=ENC_NONE ) + che.freq = che.passno = 0; + else + { + che.freq = 1; + che.passno = (mp=="/") ? 1 : 2; + } } if( changed ) { Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Thu Oct 11 13:33:19 2007 @@ -9,6 +9,8 @@ - handle EVMS over md correctly in GetUsedEvmsDisks (#266538) - fixed crash during detection caused by empty key-value-pair (#278169) - improve discrimination between EFI and win partitions (#287289) +- fix missing initialisation of tmpcrypt (#307219) +- fix case of nonzero passno for encrypted fstab entries (#307221) ------------------------------------------------------------------- Mon Oct 8 10:49:37 CEST 2007 - fehr(a)suse.de -- 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] r41368 - in /trunk/yast2: library/control/src/WorkflowManager.ycp package/yast2.changes
by locilka＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: locilka Date: Thu Oct 11 13:33:17 2007 New Revision: 41368 URL: http://svn.opensuse.org/viewcvs/yast?rev=41368&view=rev Log: - Merging every single workflow only once, skipping duplicate additional workflows even if provided by a different file name (#332436). Modified: trunk/yast2/library/control/src/WorkflowManager.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/control/src/WorkflowManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/control/src/Workfl… ============================================================================== --- trunk/yast2/library/control/src/WorkflowManager.ycp (original) +++ trunk/yast2/library/control/src/WorkflowManager.ycp Thu Oct 11 13:33:17 2007 @@ -1035,6 +1035,27 @@ } /** + * Returns file unique identification in format ${file_MD5sum}-${file_size} + * Returns 'nil' if file doesn't exist, it is not a 'file', etc. + * + * @param string file + * @return string file_ident + */ + string GenerateWorkflowIdent (string workflow_filename) { + string file_md5sum = FileUtils::MD5sum (workflow_filename); + + if (file_md5sum == nil || file_md5sum == "") + return nil; + + integer file_size = FileUtils::GetSize (workflow_filename); + + if (file_size < 0) + return nil; + + return sformat ("%1-%2", file_md5sum, file_size); + } + + /** * Function uses the Base Workflow as the initial one and merges all * added workflow into that workflow. * @@ -1049,7 +1070,20 @@ boolean ret = true; + list <string> already_merged_workflows = []; + foreach (string one_workflow, used_workflows, { + // make sure that every workflow is merged only once + // bugzilla #332436 + string workflow_ident = GenerateWorkflowIdent (one_workflow); + + if (workflow_ident != nil && contains (already_merged_workflows, workflow_ident)) { + y2milestone ("The very same workflow has been already merged, skipping..."); + return; + } else { + already_merged_workflows = add (already_merged_workflows, workflow_ident); + } + if (! IntegrateWorkflow (one_workflow)) { y2error ("Merging '%1' failed!", one_workflow); Report::Error (_("An internal error occured when integrating additional workflow.")); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Oct 11 13:33:17 2007 @@ -2,6 +2,9 @@ Thu Oct 11 11:52:23 CEST 2007 - locilka(a)suse.cz - New function FileUtils::MD5sum. +- Merging every single workflow only once, skipping duplicate + additional workflows even if provided by a different file name + (#332436). ------------------------------------------------------------------- Thu Oct 4 16:29:01 CEST 2007 - jsrain(a)suse.cz -- 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] r41367 - in /branches/SuSE-SLE-10-SP1-Branch/storage: libstorage/src/ package/ storage/src/include/ storage/src/modules/
by fehr＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: fehr Date: Thu Oct 11 13:27:21 2007 New Revision: 41367 URL: http://svn.opensuse.org/viewcvs/yast?rev=41367&view=rev Log: improve discrimination between EFI and win partitions (#287289) Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.cc branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.h branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/StorageInterface.h branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/include/do_proposal_flexible.ycp branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.cc Thu Oct 11 13:27:21 2007 @@ -5049,7 +5049,8 @@ bool Storage::getFreeInfo( const string& device, unsigned long long& resize_free, unsigned long long& df_free, - unsigned long long& used, bool& win, bool use_cache ) + unsigned long long& used, bool& win, bool& efi, + bool use_cache ) { bool ret = false; assertInit(); @@ -5059,7 +5060,7 @@ if( findVolume( device, vol ) ) { if( use_cache && getFreeInf( vol->device(), df_free, resize_free, - used, win, ret )) + used, win, efi, ret )) { } else @@ -5132,6 +5133,9 @@ win = access( f.c_str(), R_OK )==0; i++; } + efi = vol->getFs()==VFAT && checkDir( mp + "/efi" ); + if( efi ) + win = false; } if( needUmount ) { @@ -5146,7 +5150,8 @@ if( !ret ) vol->crUnsetup(); } - setFreeInfo( vol->device(), df_free, resize_free, used, win, ret ); + setFreeInfo( vol->device(), df_free, resize_free, used, win, efi, + ret ); } } if( ret ) @@ -5158,19 +5163,21 @@ void Storage::setFreeInfo( const string& device, unsigned long long df_free, unsigned long long resize_free, - unsigned long long used, bool win, bool resize_ok ) + unsigned long long used, bool win, bool efi, + bool resize_ok ) { - y2milestone( "device:%s df_free:%llu resize_free:%llu used:%llu win:%d", - device.c_str(), df_free, resize_free, used, win ); + y2milestone( "device:%s df_free:%llu resize_free:%llu used:%llu win:%d efi:%d", + device.c_str(), df_free, resize_free, used, win, efi ); - FreeInfo inf( df_free, resize_free, used, win, resize_ok ); + FreeInfo inf( df_free, resize_free, used, win, efi, resize_ok ); freeInfo[device] = inf; } bool Storage::getFreeInf( const string& device, unsigned long long& df_free, unsigned long long& resize_free, - unsigned long long& used, bool& win, bool& resize_ok ) + unsigned long long& used, bool& win, bool& efi, + bool& resize_ok ) { map<string,FreeInfo>::iterator i = freeInfo.find( device ); bool ret = i!=freeInfo.end(); @@ -5180,12 +5187,13 @@ resize_free = i->second.resize_free; used = i->second.used; win = i->second.win; + efi = i->second.efi; resize_ok = i->second.rok; } y2milestone( "device:%s ret:%d", device.c_str(), ret ); if( ret ) - y2milestone( "df_free:%llu resize_free:%llu used:%llu win:%d resize_ok:%d", - df_free, resize_free, used, win, resize_ok ); + y2milestone( "df_free:%llu resize_free:%llu used:%llu win:%d efi:%d resize_ok:%d", + df_free, resize_free, used, win, efi, resize_ok ); return( ret ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.h (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.h Thu Oct 11 13:27:21 2007 @@ -124,12 +124,15 @@ unsigned long long df_free; unsigned long long used; bool win; + bool efi; bool rok; - FreeInfo() { resize_free=df_free=used=0; win=rok=false; } + FreeInfo() { resize_free=df_free=used=0; efi=win=rok=false; } FreeInfo( unsigned long long df, unsigned long long resize, - unsigned long long usd, bool w=false, bool r=true ) - { resize_free=resize; df_free=df; used=usd; win=w; rok=r; } + unsigned long long usd, bool w=false, bool e=false, + bool r=true ) + { resize_free=resize; df_free=df; used=usd; win=w; + efi=e, rok=r; } }; public: @@ -280,7 +283,8 @@ bool readFstab( const string& dir, deque<storage::VolumeInfo>& infos); bool getFreeInfo( const string& device, unsigned long long& resize_free, unsigned long long& df_free, - unsigned long long& used, bool& win, bool use_cache ); + unsigned long long& used, bool& win, bool& efi, + bool use_cache ); int createBackupState( const string& name ); int removeBackupState( const string& name ); int restoreBackupState( const string& name ); @@ -1292,10 +1296,12 @@ void deleteBackups(); void setFreeInfo( const string& device, unsigned long long df_free, unsigned long long resize_free, - unsigned long long used, bool win, bool resize_ok ); + unsigned long long used, bool win, bool efi, + bool resize_ok ); bool getFreeInf( const string& device, unsigned long long& df_free, unsigned long long& resize_free, - unsigned long long& used, bool& win, bool& resize_ok ); + unsigned long long& used, bool& win, bool& efi, + bool& resize_ok ); // protected internal member variables bool readonly; Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/StorageInterface.h (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/StorageInterface.h Thu Oct 11 13:27:21 2007 @@ -1860,7 +1860,7 @@ unsigned long long& resize_free, unsigned long long& df_free, unsigned long long& used, - bool& win, bool use_cache ) = 0; + bool& win, bool& efi, bool use_cache ) = 0; /** * Read fstab and cryptotab, if existent, from a specified directory and Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Thu Oct 11 13:27:21 2007 @@ -8,6 +8,7 @@ - overwrite newly created md devices as partitions (#266538) - handle EVMS over md correctly in GetUsedEvmsDisks (#266538) - fixed crash during detection caused by empty key-value-pair (#278169) +- improve discrimination between EFI and win partitions (#287289) ------------------------------------------------------------------- Mon Oct 8 10:49:37 CEST 2007 - fehr(a)suse.de Modified: branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/include/do_proposal_flexible.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/include/do_proposal_flexible.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/include/do_proposal_flexible.ycp Thu Oct 11 13:27:21 2007 @@ -1634,7 +1634,8 @@ { win = p["winfo"]:$[]; y2milestone( "try_resize_windows win=%1", win ); - if( win != nil && win["ok"]:false && p["size_k"]:0 > 1024*1024 ) + if( win != nil && win["ok"]:false && p["size_k"]:0 > 1024*1024 && + !win["efi"]:false ) { p["winfo"] = win; p["resize"] = true; @@ -2519,7 +2520,7 @@ if( ret ) { if( assert_cons_fs ) - ret = p["winfo","ok"]:false; + ret = p["winfo","ok"]:false && !p["winfo","efi"]:false; else ret = size(p["winfo"]:$[])>0; } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp Thu Oct 11 13:27:21 2007 @@ -694,11 +694,12 @@ integer resize_free = 0; integer df_free = 0; boolean win_disk = false; + boolean efi = false; boolean r = false; r = LibStorage::StorageInterface::getFreeInfo( sint, device, resize_free, df_free, used, win_disk, - used_fs==`ntfs ); + efi, used_fs==`ntfs ); resize_free = resize_free * 1024; // Byte df_free = df_free * 1024; // Byte @@ -781,6 +782,7 @@ "df_free" : df_free, "used":used, "win_disk":win_disk, + "efi":efi, "linux_size":linux_size, "max_win_size":used + resize_free + add_free - min_linux_size, "ntfs" : (used_fs == `ntfs), @@ -3014,6 +3016,14 @@ return( ret ); } +define 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 ); + } + /** * Search in the list partitions for windows partitions and add the key * "mount" to the found windows partitions. @@ -3046,7 +3056,7 @@ ((partnum<=max_prim)==primary) && foreign_nr < 24 && Partitions::IsDosWinNtPartition(fsid) && - (!Arch::ia64() || partition["size_k"]:0 >= 1024*1024) && + (!Arch::ia64() || !IsEfiPartition(partition)) && contains( [`vfat, `ntfs], partition["used_fs"]:`none )) { new_partition["fstopt"] = -- 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] r41366 - in /branches/SuSE-SLE-10-SP1-Branch/storage: libstorage/src/AppUtil.cc package/yast2-storage.changes
by fehr＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: fehr Date: Thu Oct 11 13:23:06 2007 New Revision: 41366 URL: http://svn.opensuse.org/viewcvs/yast?rev=41366&view=rev Log: fixed crash during detection caused by empty key-value-pair (#278169) Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/AppUtil.cc branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/AppUtil.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/AppUtil.cc Thu Oct 11 13:23:06 2007 @@ -346,7 +346,9 @@ if( (pos=i->find_first_of( delim ))!=string::npos ) { k = i->substr( 0, pos ); - v = i->substr( i->find_first_not_of( delim, pos+1 ) ); + string::size_type pos2 = i->find_first_not_of( delim, pos+1 ); + if( pos2 != string::npos ) + v = i->substr( pos2 ); } if( !removeSur.empty() ) { @@ -359,7 +361,8 @@ if( !v.empty() && (pos=v.find_last_of(removeSur))==v.size()-1 ) v.erase( v.find_last_not_of(removeSur)+1 ); } - ret[k] = v; + if( !k.empty() && !v.empty() ) + ret[k] = v; } return( ret ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Thu Oct 11 13:23:06 2007 @@ -7,6 +7,7 @@ - correctly compute maximal allowable cylinder (#273286) - overwrite newly created md devices as partitions (#266538) - handle EVMS over md correctly in GetUsedEvmsDisks (#266538) +- fixed crash during detection caused by empty key-value-pair (#278169) ------------------------------------------------------------------- Mon Oct 8 10:49:37 CEST 2007 - fehr(a)suse.de -- 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] r41365 - in /branches/SuSE-SLE-10-SP1-Branch/storage: libstorage/src/MdCo.cc package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: fehr Date: Thu Oct 11 13:16:42 2007 New Revision: 41365 URL: http://svn.opensuse.org/viewcvs/yast?rev=41365&view=rev Log: - overwrite newly created md devices as partitions (#266538) - handle EVMS over md correctly in GetUsedEvmsDisks (#266538) Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/MdCo.cc branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/MdCo.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/MdCo.cc Thu Oct 11 13:16:42 2007 @@ -592,6 +592,21 @@ getStorage()->waitForDevice( m->device() ); getMdData( m->nr() ); updateEntry( m ); + bool used_as_pv = m->getUsedByType()==UB_EVMS || + m->getUsedByType()==UB_LVM; + y2milestone( "zeroNew:%d used_as_pv:%d", + getStorage()->getZeroNewPartitions(), used_as_pv ); + if( used_as_pv || getStorage()->getZeroNewPartitions() ) + { + string cmd; + SystemCmd c; + cmd = "dd if=/dev/zero of=" + m->device() + " bs=1k count=200"; + c.execute( cmd ); + cmd = "dd if=/dev/zero of=" + m->device() + + " seek=" + decString(m->sizeK()-10) + + " bs=1k count=10"; + c.execute( cmd ); + } } } else Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Thu Oct 11 13:16:42 2007 @@ -5,6 +5,8 @@ - fix performance hog with large number of disks and swap areas (#267262) - fix bug in member function equalContent (#245734) - correctly compute maximal allowable cylinder (#273286) +- overwrite newly created md devices as partitions (#266538) +- handle EVMS over md correctly in GetUsedEvmsDisks (#266538) ------------------------------------------------------------------- Mon Oct 8 10:49:37 CEST 2007 - fehr(a)suse.de Modified: branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp Thu Oct 11 13:16:42 2007 @@ -5127,7 +5127,21 @@ ``(p["used_by_type"]:`UB_NONE==`UB_LVM && p["used_by"]:""==namel)))>0) )) { - rdisk = (list<string>)union( rdisk, [ disk ] ); + list<string> dl = [ disk ]; + if( disk=="/dev/md" ) + { + list<map> tl = []; + tl = filter( map p, data["partitions"]:[], + ``((p["used_by_type"]:`UB_NONE==`UB_EVMS && + p["used_by"]:""==name)|| + (p["used_by_type"]:`UB_NONE==`UB_LVM && + p["used_by"]:""==namel))); + dl = maplist( map p, tl, ``(p["device"]:"")); + dl = (list<string>)sort( dl ); + dl = (list<string>)toset( dl ); + y2milestone( "GetEvmsRealDisk dl %1", dl ); + } + rdisk = (list<string>)union( rdisk, dl ); } }); if( size(rdisk)==0 && !p["evms_native"]:false ) @@ -5157,12 +5171,16 @@ list<string> dl = GetEvmsRealDisk( tg, p ); foreach( string d, dl, ``{ + y2milestone( "GetUsedEvmsDisks d %1", d ); if( search( d, "/dev/md" ) == 0 ) { list<string> ndl = []; foreach( string dd, map pp, tg, ``{ - if( pp["used_by"]:"" == substring(d,5) ) + map pu = find( map p, pp["partitions"]:[], + ``(p["used_by"]:""==substring(d,5)) ); + y2milestone( "GetUsedEvmsDisks disk:%1 used:%2", dd, pu ); + if( pu!=nil && size(pu)>0 ) { ndl = add( ndl, dd ); } -- 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] r41364 - in /branches/SuSE-SLE-10-SP1-Branch/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: fehr Date: Thu Oct 11 13:15:19 2007 New Revision: 41364 URL: http://svn.opensuse.org/viewcvs/yast?rev=41364&view=rev Log: - correctly compute maximal allowable cylinder (#273286) Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Thu Oct 11 13:15:19 2007 @@ -4,6 +4,7 @@ - add support for online resize of ext3 (feature #301943) - fix performance hog with large number of disks and swap areas (#267262) - fix bug in member function equalContent (#245734) +- correctly compute maximal allowable cylinder (#273286) ------------------------------------------------------------------- Mon Oct 8 10:49:37 CEST 2007 - fehr(a)suse.de Modified: branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp Thu Oct 11 13:15:19 2007 @@ -2152,12 +2152,11 @@ { integer ret = MaxSizeLabelK(disk); y2milestone( "MaxCylLabel val_k:%1 cyl_size:%2", ret, disk["cyl_size"]:1 ); - integer cylk = disk["cyl_size"]:1/1024; - if( cylk<1 ) - cylk = 1; - y2milestone( "MaxCylLabel val_k:%1 cylk:%2", ret, cylk ); - ret = ret / cylk; - y2milestone( "MaxCylLabel ret %1", ret ); + integer cylk2 = disk["cyl_size"]:1/512; + if( cylk2<2 ) + cylk2 = 2; + y2milestone( "MaxCylLabel val_k:%1 cylk2:%2", ret, cylk2 ); + ret = ret*2 / cylk2 - 1; return( ret ); } -- 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] r41363 - in /branches/SuSE-SLE-10-SP1-Branch/storage: libstorage/src/ package/
by fehr＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: fehr Date: Thu Oct 11 13:14:15 2007 New Revision: 41363 URL: http://svn.opensuse.org/viewcvs/yast?rev=41363&view=rev Log: fix bug in member function equalContent (#245734) Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Disk.cc branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/DmCo.cc branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/EvmsCo.cc branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LoopCo.cc branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LvmVg.cc branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/MdCo.cc branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/PeContainer.cc branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.cc branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Disk.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Disk.cc Thu Oct 11 13:14:15 2007 @@ -2597,7 +2597,7 @@ ++i; ++j; } - ret == ret && i==p.end() && j==pc.end(); + ret = ret && i==p.end() && j==pc.end(); } return( ret ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/DmCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/DmCo.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/DmCo.cc Thu Oct 11 13:14:15 2007 @@ -344,7 +344,7 @@ ++i; ++j; } - ret == ret && i==p.end() && j==pc.end(); + ret = ret && i==p.end() && j==pc.end(); } return( ret ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/EvmsCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/EvmsCo.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/EvmsCo.cc Thu Oct 11 13:14:15 2007 @@ -1941,7 +1941,7 @@ ++i; ++j; } - ret == ret && i==p.end() && j==pc.end(); + ret = ret && i==p.end() && j==pc.end(); } return( ret ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LoopCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LoopCo.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LoopCo.cc Thu Oct 11 13:14:15 2007 @@ -397,7 +397,7 @@ ++i; ++j; } - ret == ret && i==p.end() && j==pc.end(); + ret = ret && i==p.end() && j==pc.end(); } return( ret ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LvmVg.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LvmVg.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LvmVg.cc Thu Oct 11 13:14:15 2007 @@ -1501,7 +1501,7 @@ ++i; ++j; } - ret == ret && i==p.end() && j==pc.end(); + ret = ret && i==p.end() && j==pc.end(); } return( ret ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/MdCo.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/MdCo.cc Thu Oct 11 13:14:15 2007 @@ -725,7 +725,7 @@ ++i; ++j; } - ret == ret && i==p.end() && j==pc.end(); + ret = ret && i==p.end() && j==pc.end(); } return( ret ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/PeContainer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/PeContainer.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/PeContainer.cc Thu Oct 11 13:14:15 2007 @@ -727,7 +727,7 @@ CVIter j = begin(); while( ret && i!=rhs.end() && j!=end() ) ret = ret && ((Dm*)(&(*j)))->equalContent( *(Dm*)(&(*i))); - ret == ret && i==rhs.end() && j==end(); + ret = ret && i==rhs.end() && j==end(); } return( ret ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.cc Thu Oct 11 13:14:15 2007 @@ -4445,7 +4445,7 @@ } void -Storage::logCo( Container* c ) +Storage::logCo( Container* c ) const { std::ostringstream b; c->print( b ); Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Thu Oct 11 13:14:15 2007 @@ -3,6 +3,7 @@ - add support for online resize of ext3 (feature #301943) - fix performance hog with large number of disks and swap areas (#267262) +- fix bug in member function equalContent (#245734) ------------------------------------------------------------------- Mon Oct 8 10:49:37 CEST 2007 - fehr(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0