Author: fehr Date: Thu Jan 17 12:18:24 2008 New Revision: 43696 URL: http://svn.opensuse.org/viewcvs/yast?rev=43696&view=rev Log: fix handling of sun disk label (#353546) Modified: trunk/storage/libstorage/src/Disk.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?rev=43696&r1=43695&r2=43696&view=diff ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Thu Jan 17 12:18:24 2008 @@ -1159,6 +1159,8 @@ { if( i->nr()==start ) start++; + if( label=="sun" && start==3 ) + start++; ++i; } if( start<=max_primary ) @@ -1365,6 +1367,8 @@ } if( ret==0 ) { + if( label=="sun" && start==0 ) + start=1; Partition * p = new Partition( *this, number, cylinderToKb(len), start, len, type ); PartPair pp = partPair(); @@ -1953,7 +1957,7 @@ ret = DISK_SET_TYPE_PARTED_FAILED; } } - if( ret==0 ) + if( ret==0 && (label!="sun")) { cmd_line.str( start_cmd ); cmd_line.seekp(0, ios_base::end ); @@ -2138,20 +2142,23 @@ if( ret==0 ) { cmd_line << PARTEDCMD << device() << " unit cyl mkpart "; - switch( p->type() ) + if( label != "sun" ) { - case LOGICAL: - cmd_line << "logical "; - break; - case PRIMARY: - cmd_line << "primary "; - break; - case EXTENDED: - cmd_line << "extended "; - break; - default: - ret = DISK_CREATE_PARTITION_INVALID_TYPE; - break; + switch( p->type() ) + { + case LOGICAL: + cmd_line << "logical "; + break; + case PRIMARY: + cmd_line << "primary "; + break; + case EXTENDED: + cmd_line << "extended "; + break; + default: + ret = DISK_CREATE_PARTITION_INVALID_TYPE; + break; + } } } if( ret==0 && p->type()!=EXTENDED ) Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=43696&r1=43695&r2=43696&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Jan 17 12:18:24 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 17 12:17:53 CET 2008 - fehr@suse.de + +- fix handling of sun disk label (#353546) + +------------------------------------------------------------------- Wed Jan 16 13:13:33 CET 2008 - fehr@suse.de - make sure NFS entries in fstab get zero passno field -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org