Author: aschnell Date: Mon Apr 2 17:53:56 2012 New Revision: 67847 URL: http://svn.opensuse.org/viewcvs/yast?rev=67847&view=rev Log: - calculate max_primary for artificial XEN disks (bnc#754649) Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Disk.cc branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Disk.cc?rev=67847&r1=67846&r2=67847&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Disk.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Disk.cc Mon Apr 2 17:53:56 2012 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2004-2010] Novell, Inc. + * Copyright (c) [2004-2012] Novell, Inc. * * All Rights Reserved. * @@ -70,12 +70,14 @@ Disk::Disk(Storage* s, const string& name, const string& device, unsigned num, unsigned long long SizeK, SystemInfo& systeminfo) : Container(s, name, device, staticType(), systeminfo), + max_primary(0), ext_possible(false), max_logical(0), init_disk(false), transport(TUNKNOWN), dmp_slave(false), no_addpart(false), - gpt_enlarge(false), del_ptable(false) + gpt_enlarge(false), range(255), del_ptable(false) { y2mil("constructed Disk name:" << name << " nr " << num << " sizeK:" << SizeK); logfile_name = name + decString(num); ronly = true; + label = "xenxvd"; // artificial size_k = SizeK; addPartition( num, size_k, systeminfo ); } @@ -684,6 +686,7 @@ { "dasd", false, 3, 0, (1ULL << 32) - 1 }, { "aix", false, 0, 0, (1ULL << 32) - 1 }, { "amiga", false, 63, 0, (1ULL << 32) - 1 }, + { "xenxvd", false, 256, 0, (1ULL << 32) - 1 }, // artificial { "", false, 0, 0, 0 } }; @@ -2393,6 +2396,7 @@ p->setSize( sz ); } addToList( p ); + max_primary = max(max_primary, num); } unsigned Disk::numPartitions() const Modified: branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes?rev=67847&r1=67846&r2=67847&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes Mon Apr 2 17:53:56 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Apr 02 16:11:03 CEST 2012 - aschnell@suse.de + +- calculate max_primary for artificial XEN disks (bnc#754649) + +------------------------------------------------------------------- Thu Mar 29 12:14:35 CEST 2012 - fehr@suse.de - patched proofread texts back into source code -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org