Author: fehr Date: Thu Aug 30 14:09:59 2007 New Revision: 40621 URL: http://svn.opensuse.org/viewcvs/yast?rev=40621&view=rev Log: prevent proposal of install medium under XEN (#297321) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=40621&r1=40620&r2=40621&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Aug 30 14:09:59 2007 @@ -3,6 +3,7 @@ - call insserv for boot.crypto during update from <=10.2 (#305105) - restart boot.quota if quota options have changed (#304841) +- prevent proposal of install medium under XEN (#297321) ------------------------------------------------------------------- Tue Aug 28 17:28:32 CEST 2007 - fehr@suse.de Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=40621&r1=40620&r2=40621&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Aug 30 14:09:59 2007 @@ -6355,7 +6355,19 @@ no_propose_disks = []; if( Stage::initial() && SCR::Read( .target.size, "/etc/install.inf" )>0 ) { - string inst = (string) SCR::Read( .etc.install_inf.Cdrom ); + string inst = (string) SCR::Read( .etc.install_inf.Partition ); + y2milestone( "NoProposeDisks .etc.install_inf.Partition \"%1\"", + inst ); + if( inst!=nil && size(inst)>0 ) + { + if( search( inst, "/dev/" )!=0 ) + inst = "/dev/" + inst; + map d = GetDiskPartition( inst ); + y2milestone( "NoProposeDisks inst:%1 disk:%2", inst, d ); + if( size(d["disk"]:"")>0 ) + no_propose_disks = add( no_propose_disks, d["disk"]:"" ); + } + inst = (string) SCR::Read( .etc.install_inf.Cdrom ); y2milestone( "NoProposeDisks .etc.install_inf.Cdrom \"%1\"", inst ); if( inst!=nil && size(inst)>0 ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org