Author: aschnell Date: Mon Oct 20 12:39:51 2008 New Revision: 52360 URL: http://svn.opensuse.org/viewcvs/yast?rev=52360&view=rev Log: - avoid clearing file system label (bnc #436360) Modified: trunk/storage/VERSION trunk/storage/libstorage/src/Disk.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=52360&r1=52359&r2=52360&view=diff ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Mon Oct 20 12:39:51 2008 @@ -1 +1 @@ -2.17.40 +2.17.41 Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?rev=52360&r1=52359&r2=52360&view=diff ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Mon Oct 20 12:39:51 2008 @@ -1978,6 +1978,8 @@ { getStorage()->showInfoCb( p->setTypeText(true) ); } + if( p->id()!=Partition::ID_LINUX && p->id()!=Partition::ID_SWAP ) + p->eraseLabel(); system_stderr.erase(); std::ostringstream cmd_line; classic(cmd_line); @@ -2310,7 +2312,16 @@ } else if( !dmp_slave && !p->getFormat() ) { + bool lsave = false; + string lbl; + if( p->needLabel() ) + { + lsave = true; + lbl = p->getLabel(); + } p->updateFsData(); + if( lsave ) + p->setLabel(lbl); } } if( ret==0 && !dmp_slave && p->id()!=Partition::ID_LINUX ) Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=52360&r1=52359&r2=52360&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Oct 20 12:39:51 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 20 12:36:48 CEST 2008 - aschnell@suse.de + +- avoid clearing file system label (bnc #436360) +- 2.17.41 + +------------------------------------------------------------------- Thu Oct 16 15:52:01 CEST 2008 - aschnell@suse.de - fixed creation of lvm logical volumes (bnc #436059) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org