August 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r49707 - in /trunk/storage/libstorage/src: Disk.cc MdCo.cc Storage.cc Storage.h StorageTypes.h
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 14:31:38 2008 New Revision: 49707 URL: http://svn.opensuse.org/viewcvs/yast?rev=49707&view=rev Log: - remove more evms code Modified: trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/MdCo.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/StorageTypes.h Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Tue Aug 5 14:31:38 2008 @@ -2277,8 +2277,7 @@ } if( ret==0 && p->type()!=EXTENDED ) { - bool used_as_pv = p->getUsedByType()==UB_EVMS || - p->getUsedByType()==UB_LVM; + bool used_as_pv = p->getUsedByType() == UB_LVM; y2milestone( "zeroNew:%d used_as_pv:%d", getStorage()->getZeroNewPartitions(), used_as_pv ); if( used_as_pv || getStorage()->getZeroNewPartitions() ) Modified: trunk/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/MdCo.cc (original) +++ trunk/storage/libstorage/src/MdCo.cc Tue Aug 5 14:31:38 2008 @@ -622,8 +622,7 @@ getStorage()->waitForDevice( m->device() ); getMdData( m->nr() ); updateEntry( m ); - bool used_as_pv = m->getUsedByType()==UB_EVMS || - m->getUsedByType()==UB_LVM; + bool used_as_pv = m->getUsedByType() == UB_LVM; y2milestone( "zeroNew:%d used_as_pv:%d", getStorage()->getZeroNewPartitions(), used_as_pv ); if( used_as_pv || getStorage()->getZeroNewPartitions() ) Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Tue Aug 5 14:31:38 2008 @@ -3827,8 +3827,9 @@ co.type()==DMRAID ); } -bool Storage::removeDmMapsTo( const string& dev, bool also_evms ) +bool Storage::removeDmMapsTo( const string& dev ) { + bool also_evms = false; bool ret = false; y2milestone( "dev:%s also_evms:%d", dev.c_str(), also_evms ); VPair vp = vPair( isDmContainer ); Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Tue Aug 5 14:31:38 2008 @@ -444,7 +444,7 @@ void removeDmTableTo( const Volume& vol ); void removeDmTableTo( const string& device ); bool removeDmTable( const string& table ); - bool removeDmMapsTo( const string& dev, bool also_evms=false ); + bool removeDmMapsTo( const string& dev ); bool checkDmMapsTo( const string& dev ); void updateDmEmptyPeMap(); void dumpObjectList(); Modified: trunk/storage/libstorage/src/StorageTypes.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTy… ============================================================================== --- trunk/storage/libstorage/src/StorageTypes.h (original) +++ trunk/storage/libstorage/src/StorageTypes.h Tue Aug 5 14:31:38 2008 @@ -122,9 +122,6 @@ case storage::UB_MD: st = "md"; break; - case storage::UB_EVMS: - st = "evms"; - break; case storage::UB_DM: st = "dm"; break; -- 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] r49706 - in /trunk/storage/libstorage/src: AppUtil.h Evms.cc Evms.h EvmsCo.cc EvmsCo.h StorageInterface.h
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 14:19:39 2008 New Revision: 49706 URL: http://svn.opensuse.org/viewcvs/yast?rev=49706&view=rev Log: - removed evms structs from StorageInterface.h Modified: trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/Evms.cc trunk/storage/libstorage/src/Evms.h trunk/storage/libstorage/src/EvmsCo.cc trunk/storage/libstorage/src/EvmsCo.h trunk/storage/libstorage/src/StorageInterface.h Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Tue Aug 5 14:19:39 2008 @@ -96,8 +96,6 @@ return dngettext("storage", msgid, msgid_plural, n); } -#define IPC_PROJ_ID 7890 - extern bool system_cmd_testmode; extern const string app_ws; Modified: trunk/storage/libstorage/src/Evms.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Evms.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Evms.cc (original) +++ trunk/storage/libstorage/src/Evms.cc Tue Aug 5 14:19:39 2008 @@ -265,16 +265,6 @@ return( txt ); } -void Evms::getInfo( EvmsInfo& tinfo ) const - { - ((Volume*)this)->getInfo( info.v ); - info.stripe = stripe; - info.stripe_size = stripe_size; - info.compatible = compat; - info.dm_table = tname; - info.dm_target = target; - tinfo = info; - } namespace storage { Modified: trunk/storage/libstorage/src/Evms.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Evms.h?re… ============================================================================== --- trunk/storage/libstorage/src/Evms.h (original) +++ trunk/storage/libstorage/src/Evms.h Tue Aug 5 14:19:39 2008 @@ -25,7 +25,6 @@ string resizeText( bool doing ) const; void updateMd(); - void getInfo(storage::EvmsInfo&) const; bool equalContent( const Evms& rhs ) const; void logDifference( const Evms& d ) const; const EvmsCo* evmsCo() const; @@ -38,7 +37,7 @@ static string getMapperName( const EvmsCo& d, const string& name ); bool compat; - mutable storage::EvmsInfo info; + }; } Modified: trunk/storage/libstorage/src/EvmsCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EvmsCo.cc… ============================================================================== --- trunk/storage/libstorage/src/EvmsCo.cc (original) +++ trunk/storage/libstorage/src/EvmsCo.cc Tue Aug 5 14:19:39 2008 @@ -1191,14 +1191,6 @@ } if( ret ) { - key_t k = ftok( EXEC_PATH, IPC_PROJ_ID ); - semid = semget( k, 1, IPC_CREAT|0600 ); - y2milestone( "ipc key:%x semid:%d", k, semid ); - if( semid<0 ) - { - ret = false; - y2error( "semget failed errno=%d (%s)", errno, strerror(errno) ); - } } if( ret ) { @@ -1858,48 +1850,6 @@ } -void EvmsCo::getInfo( EvmsCoInfo& tinfo ) const - { - info.sizeK = sizeK(); - info.peSize = peSize(); - info.peCount = peCount(); - info.peFree = peFree(); - info.lvm2 = lvm2(); - info.create = created(); - info.uuid = uuid; - info.realContainer = !nm.empty(); - info.devices.clear(); - list<Pv>::const_iterator i=pv.begin(); - while( i!=pv.end() ) - { - if( !info.devices.empty() ) - info.devices += ' '; - info.devices += i->device; - ++i; - } - y2mil( "device:" << info.devices ); - info.devices_add.clear(); - i=pv_add.begin(); - while( i!=pv_add.end() ) - { - if( !info.devices_add.empty() ) - info.devices_add += ' '; - info.devices_add += i->device; - ++i; - } - y2mil( "devices_add:" << info.devices_add ); - info.devices_rem.clear(); - i=pv_remove.begin(); - while( i!=pv_remove.end() ) - { - if( !info.devices_rem.empty() ) - info.devices_rem += ' '; - info.devices_rem += i->device; - ++i; - } - y2mil( "devices_rem:" << info.devices_rem ); - tinfo = info; - } namespace storage { Modified: trunk/storage/libstorage/src/EvmsCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EvmsCo.h?… ============================================================================== --- trunk/storage/libstorage/src/EvmsCo.h (original) +++ trunk/storage/libstorage/src/EvmsCo.h Tue Aug 5 14:19:39 2008 @@ -119,7 +119,6 @@ int resizeVolume( Volume* v, unsigned long long newSize ); int removeVolume( Volume* v ); void addVolume( Evms* v ); - void getInfo( storage::EvmsCoInfo& info ) const; bool equalContent( const Container& rhs ) const; void logDifference( const Container& d ) const; bool checkConsistency() const; @@ -224,7 +223,7 @@ bool valid; static bool active; static int sockfd; - mutable storage::EvmsCoInfo info; + }; } Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Tue Aug 5 14:19:39 2008 @@ -214,25 +214,6 @@ }; /** - * Contains info about a EVMS Container - */ - struct EvmsCoInfo - { - EvmsCoInfo() {} - unsigned long long sizeK; - unsigned long long peSize; - unsigned long peCount; - unsigned long peFree; - string uuid; - bool lvm2; - bool create; - bool realContainer; - string devices; - string devices_add; - string devices_rem; - }; - - /** * Contains info about a DmPart disk */ struct DmPartCoInfo @@ -330,20 +311,6 @@ }; /** - * Contains info about a EVMS Volume. - */ - struct EvmsInfo - { - EvmsInfo() {} - VolumeInfo v; - unsigned stripe; - unsigned stripe_size; - bool compatible; - string dm_table; - string dm_target; - }; - - /** * Contains info about a software raid device. */ struct MdInfo -- 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] r49705 - in /trunk/storage/libstorage/src: Storage.cc Storage.h
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 14:08:43 2008 New Revision: 49705 URL: http://svn.opensuse.org/viewcvs/yast?rev=49705&view=rev Log: - removed more evms code Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Tue Aug 5 14:08:43 2008 @@ -249,7 +249,6 @@ detectMds(); detectDmraid( *ppart ); detectLvmVgs(); - detectEvms(); detectDm( *ppart ); LvmVgPair p = lvgPair(); @@ -576,58 +575,6 @@ } } -static bool isEvmsMd( const Volume& v ) - { - return( v.device().find( "/dev/evms/md/" )==0 ); - } - -void -Storage::detectEvms() - { - if( test() ) - { - glob_t globbuf; - if( glob( (testdir+"/evms_*[!~0-9]").c_str(), GLOB_NOSORT, 0, - &globbuf) == 0) - { - // TODO - } - globfree (&globbuf); - } - else if( EvmsCo::canDoEvms() ) - { - EvmsCo::activate( true ); - EvmsTree data; - EvmsCo::getEvmsList( data ); - y2mil( "EVMS TREE:" << data ); - if( !data.volumes.empty() || !data.cont.empty() ) - { - EvmsCo * e = new EvmsCo( this, data ); - Container::VolPair ep = e->volPair( isEvmsMd ); - y2mil( "md:" << ep.length() << " evms:" << e->numVolumes() ); - if( ep.length()!=e->numVolumes() ) - addToList( e ); - else - delete e; - for( list<EvmsCont>::const_iterator i=data.cont.begin(); - i!=data.cont.end(); ++i ) - { - y2mil( "EVMS Container:" << *i ); - e = new EvmsCo( this, *i, data ); - if( e->isValid() ) - { - EvmsCoIterator eco = findEvmsCo( i->name ); - if( eco != evCoEnd() ) - removeContainer( &(*eco) ); - addToList( e ); - e->checkConsistency(); - } - else - delete( e ); - } - } - } - } void Storage::detectDmraid( ProcPart& ppart ) @@ -3819,7 +3766,7 @@ if( evms_activate && haveEvms() && ((*pt==INCREASE && type==EVMS)||*pt==FORMAT||*pt==MOUNT)) { - evmsActivateDevices(); + // evmsActivateDevices(); evms_activate = false; } if( cont ) @@ -3865,7 +3812,7 @@ } if( evms_activate && haveEvms() ) { - evmsActivateDevices(); + // evmsActivateDevices(); evms_activate = false; logProcData(); } @@ -3873,98 +3820,6 @@ return( ret ); } -static bool needSaveFromEvms( const Container& c ) - { return( c.type()==DISK||c.type()==MD); } - -void -Storage::evmsActivateDevices() - { - string tblname = "wrzlbrnft"; - SystemCmd c; - list<Container*> co; - list<Volume*> vol; - list<string> save_disks; - list<string> dev_dm_remove; - - y2milestone( "start" ); - CPair p = cPair( needSaveFromEvms ); - ContIterator i = p.begin(); - while( i != p.end() ) - { - y2mil( "save:" << *i ); - i->getToCommit( FORMAT, co, vol ); - i->getToCommit( MOUNT, co, vol ); - Disk* disk; - if( i->type()==DISK && arch().find("ppc")==0 && - (disk = dynamic_cast<Disk *>(&(*i)))!=NULL ) - { - Disk::PartPair dp = disk->partPair(Disk::bootSpecial); - for (Disk::PartIter i2 = dp.begin(); i2 != dp.end(); ++i2) - { - y2mil( "boot:" << *i2 ); - dev_dm_remove.push_back(i2->device()); - vol.push_back( &(*i2) ); - } - } - ++i; - } - if( !vol.empty() ) - { - const Container* cp; - vol.sort( sort_vol_normal ); - vol.unique(); - std::ostringstream b; - b << "saved vol <"; - for( list<Volume*>::const_iterator i=vol.begin(); i!=vol.end(); ++i ) - { - if( i!=vol.begin() ) - b << " "; - b << (*i)->device(); - if( (*i)->cType()==DISK && - (cp = (*i)->getContainer())!=NULL ) - { - if( find( save_disks.begin(), save_disks.end(), cp->device() ) - == save_disks.end() ) - { - save_disks.push_back( cp->device() ); - } - } - } - b << "> "; - y2milestone( "%s", b.str().c_str() ); - y2mil( "saved_disks " << save_disks ); - for( list<string>::const_iterator i=save_disks.begin(); - i!=save_disks.end(); ++i ) - { - removeDmMapsTo( *i, true ); - } - removeDmTable( tblname ); - string fname = tmpDir()+"/tfile"; - unlink( fname.c_str() ); - ofstream tfile( fname.c_str() ); - unsigned count=0; - for( list<Volume*>::const_iterator i=vol.begin(); i!=vol.end(); ++i ) - { - tfile << count*10 << " 10 linear " << (*i)->device() << " 0" - << endl; - count++; - } - tfile.close(); - c.execute( "cat " + fname ); - c.execute(DMSETUPBIN " create " + quote(tblname) + " <" + fname); - unlink( fname.c_str() ); - } - EvmsCo::activateDevices(); - if( !vol.empty() ) - { - removeDmTable( tblname ); - y2mil( "dev_dm_remove:" << dev_dm_remove ); - for( list<string>::const_iterator i=dev_dm_remove.begin(); - i!=dev_dm_remove.end(); ++i ) - removeDmTableTo( *i ); - } - updateDmEmptyPeMap(); - } static bool isDmContainer( const Container& co ) { Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Tue Aug 5 14:08:43 2008 @@ -1632,7 +1632,6 @@ void detectLoops( ProcPart& ppart ); void detectNfs( ProcMounts& mounts ); void detectLvmVgs(); - void detectEvms(); void detectDmraid( ProcPart& ppart ); void detectDm( ProcPart& ppart ); void initDisk( DiskData& data, ProcPart& pp ); @@ -1679,7 +1678,6 @@ std::list<storage::commitAction*>& todo ); bool ignoreError( std::list<commitAction*>::iterator i, std::list<commitAction*>& al ); - void evmsActivateDevices(); string backupStates() const; void detectObjects(); void deleteClist( CCont& co ); @@ -1715,7 +1713,6 @@ static string sysfs_dir; static bool is_ppc_mac; static bool is_ppc_pegasos; - static bool no_evms; CCont cont; EtcFstab *fstab; -- 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] r49704 - /trunk/yast2/library/network/src/SuSEFirewallServices.ycp
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 13:50:13 2008 New Revision: 49704 URL: http://svn.opensuse.org/viewcvs/yast?rev=49704&view=rev Log: docu Modified: trunk/yast2/library/network/src/SuSEFirewallServices.ycp Modified: trunk/yast2/library/network/src/SuSEFirewallServices.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFi… ============================================================================== --- trunk/yast2/library/network/src/SuSEFirewallServices.ycp (original) +++ trunk/yast2/library/network/src/SuSEFirewallServices.ycp Tue Aug 5 13:50:13 2008 @@ -388,7 +388,7 @@ /** * Function returns the map of supported (known) services. * - * @return map <string, string> + * @return map <string, string> supported services * * @struct * $[ service_id : localized_service_name ] -- 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] r49703 - /trunk/yast2/library/network/src/yast2-services-translations.ycp
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 13:43:39 2008 New Revision: 49703 URL: http://svn.opensuse.org/viewcvs/yast?rev=49703&view=rev Log: Updated list of services defined by packages Modified: trunk/yast2/library/network/src/yast2-services-translations.ycp Modified: trunk/yast2/library/network/src/yast2-services-translations.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/yast2-… ============================================================================== --- trunk/yast2/library/network/src/yast2-services-translations.ycp (original) +++ trunk/yast2/library/network/src/yast2-services-translations.ycp Tue Aug 5 13:43:39 2008 @@ -259,6 +259,12 @@ // TRANSLATORS: Description of a Service (File name: xdmcp, RPM: xorg-x11), used as a common label or an item in table tmpstring = _("allow other hosts to access your display manager via XDMCP"); + // TRANSLATORS: Name of Service (File name: xorg-x11-server, RPM: xorg-x11-Xvnc), can be used as check box, item in multiple selection box... + tmpstring = _("VNC Server"); + + // TRANSLATORS: Description of a Service (File name: xorg-x11-server, RPM: xorg-x11-Xvnc), used as a common label or an item in table + tmpstring = _("Opens ports for VNC Server"); + // TRANSLATORS: Name of Service (File name: ypbind, RPM: ypbind), can be used as check box, item in multiple selection box... tmpstring = _("NIS Client"); -- 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] r49702 - /tags/branch-Linux-11_0-2_16_14/add-on-creator/
by jsuchome＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: jsuchome Date: Tue Aug 5 13:38:58 2008 New Revision: 49702 URL: http://svn.opensuse.org/viewcvs/yast?rev=49702&view=rev Log: Created tag branch-Linux-11_0-2_16_14 for add-on-creator Added: tags/branch-Linux-11_0-2_16_14/add-on-creator/ - copied from r49701, branches/SuSE-Linux-11_0-Branch/add-on-creator/ -- 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] r49701 - in /branches/SuSE-Linux-11_0-Branch/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: jsuchome Date: Tue Aug 5 13:38:51 2008 New Revision: 49701 URL: http://svn.opensuse.org/viewcvs/yast?rev=49701&view=rev Log: - recreate package metadata after signing RPMs (bnc#412591) - more logging during write phase - 2.16.14 Modified: branches/SuSE-Linux-11_0-Branch/add-on-creator/VERSION branches/SuSE-Linux-11_0-Branch/add-on-creator/package/yast2-add-on-creator.changes branches/SuSE-Linux-11_0-Branch/add-on-creator/src/AddOnCreator.ycp Modified: branches/SuSE-Linux-11_0-Branch/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/add-on… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/add-on-creator/VERSION (original) +++ branches/SuSE-Linux-11_0-Branch/add-on-creator/VERSION Tue Aug 5 13:38:51 2008 @@ -1 +1 @@ -2.16.13 +2.16.14 Modified: branches/SuSE-Linux-11_0-Branch/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/add-on… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/add-on-creator/package/yast2-add-on-creator.changes (original) +++ branches/SuSE-Linux-11_0-Branch/add-on-creator/package/yast2-add-on-creator.changes Tue Aug 5 13:38:51 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 5 12:49:14 CEST 2008 - jsuchome(a)suse.cz + +- recreate package metadata after signing RPMs (bnc#412591) +- more logging during write phase +- 2.16.14 + +------------------------------------------------------------------- Mon Jul 14 09:50:58 CEST 2008 - jsuchome(a)suse.cz - read all content file values from saved configuration (bnc#406153) Modified: branches/SuSE-Linux-11_0-Branch/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/add-on… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/add-on-creator/src/AddOnCreator.ycp (original) +++ branches/SuSE-Linux-11_0-Branch/add-on-creator/src/AddOnCreator.ycp Tue Aug 5 13:38:51 2008 @@ -43,7 +43,6 @@ import "Package"; import "PackageSystem"; import "PackagesDescr"; -import "Popup"; import "Progress"; import "Report"; import "String"; @@ -1623,11 +1622,14 @@ if (!FileUtils::Exists (descr_path)) return false; + y2milestone ("writing package description files..."); + boolean ret = true; if (descr == $[]) return ret; foreach (string lang, map data, (map<string,map>)descr, { string file_path = descr_path + "/packages." + lang; ret = ret && PackagesDescr::Write (file_path,(map<string,any>)data); + y2debug ("file '%1' written, retval: %2", file_path, ret); if (compress_package_descriptions && gzip_installed ()) { y2debug ("compressing %1 file: %2", file_path, SCR::Execute ( @@ -1641,6 +1643,7 @@ descr_path)); foreach (string file, [ "packages", "packages.DU", "packages.FL"], { string pth = tmpdir + "/" + file; + y2debug ("processing '%1'", pth); boolean compress = false; if (!FileUtils::Exists (pth) && FileUtils::Exists (pth + ".gz")) pth = pth + ".gz"; @@ -1656,14 +1659,11 @@ }); } - /* no need to read now, already done in UI or CLI - if (extra_prov_file != "" && FileUtils::Exists (extra_prov_file)) - extra_prov = (string) SCR::Read (.target.string, extra_prov_file); - */ string extra_prov = current_product["extra_prov"]:""; if (extra_prov != "" && extra_prov != nil) SCR::Write (.target.string, descr_path + "/EXTRA_PROV",extra_prov); + y2milestone ("... done"); return ret; } @@ -1793,7 +1793,7 @@ y2warning ("no %1 directory exists...", base_path); return false; } - + y2milestone ("writing licenses..."); boolean ret = true; string cmd = ""; foreach (string file, string cont, files, { @@ -1884,7 +1884,9 @@ file = file + sformat ("+%1:\n%2\n-%1:\n", key, val); } }); - SCR::Write (.target.string, descr_path + "/" + filename, file); + y2milestone ("writing pattern %1/%2: %3", descr_path, filename, + SCR::Write (.target.string, descr_path + "/" + filename, file) + ); if (compress_patterns && gzip_installed ()) { y2debug ("compressing pattern file: %1", SCR::Execute ( @@ -1931,12 +1933,14 @@ if (arch != "ZZZ_imported" && arch != "ZZZ_required" && FileUtils::Exists (out_dir)) { + y2milestone ("copying packages of '%1' arhitecture", arch); // arch_directories will be needed later for CreateMD5SUMS and // resign_packages arch_directories = (list<string>) union (arch_directories, [arch]); if (size (package2filename) > 0 && arch != "src") { + y2debug ("package names known"); foreach (string p, (list<string>) pa, { SCR::Execute (.target.bash, sformat ( "/bin/cp %1 '%2/'", package2filename[arch,p]:"", out_dir)); @@ -1944,6 +1948,7 @@ } else if (size (srcpackage2filename) > 0 && arch == "src") { + y2debug ("source packages, names known"); foreach (string p, (list<string>) pa, { SCR::Execute (.target.bash, sformat ( "/bin/cp %1 '%2/'", srcpackage2filename[arch,p]:"", out_dir)); @@ -1951,6 +1956,7 @@ } else { + y2debug ("package names not known, using wildcard"); foreach (string p, (list<string>) pa, { SCR::Execute (.target.bash, sformat ( "/bin/cp %1/%2*.rpm '%3/'", in_path, p, out_dir)); @@ -2022,7 +2028,7 @@ boolean GenerateChangelog (string base_path) { if (!Package::Installed ("inst-source-utils") && - !FileUtils::Exists ("/usr/bin//usr/bin/mk_changelog")) + !FileUtils::Exists ("/usr/bin/mk_changelog")) { y2error("inst-source-utils not installed and mk_changelog not present"); return false; @@ -2117,6 +2123,7 @@ foreach (string full_path, dirs_for_md5, { if (dir_has_files (full_path)) { + y2milestone ("creating MDBSUM in %1", full_path); // whole dir was copied -> also with original MD5SUMS if (FileUtils::Exists (full_path + "/MD5SUMS")) { @@ -2134,6 +2141,7 @@ map out = (map) SCR::Execute (.target.bash_output, sformat ("ls -A1 '%1'", full_descr_path)); foreach (string file, splitstring (out["stdout"]:"", "\n"), { if (file == "") return; + y2milestone ("creating sha1sum of %1", file); out = (map) SCR::Execute (.target.bash_output, sformat ("cd '%1' && sha1sum -- %2", full_descr_path, String::Quote (file)), $["LANG" : "C"]); @@ -2143,10 +2151,12 @@ }); // sha1sums of the rest of interesting files - foreach (string file, [ "installation.xml", "license.tar.gz", "media.1/info.txt"], + foreach (string file, [ "installation.xml", "license.tar.gz", + "media.1/info.txt"], { if (FileUtils::Exists (base_path + "/" + file)) { + y2milestone ("creating sha1sum of %1", file); out = (map) SCR::Execute (.target.bash_output, sformat ("cd '%1' && sha1sum -- %2", base_path, String::Quote (file)), $["LANG" : "C"]); string command = sformat ("echo 'HASH SHA1 %1' >> '%2/content'", @@ -2217,7 +2227,9 @@ } /** - * Sign the add-on + * Sign current Add-On product + * @param base_path path to target product directory + * @param key GPG key to sign with */ global boolean SignAddOn (string base_path, string key) { @@ -2257,6 +2269,7 @@ deletechars (out["stdout"]:"", "\n"), base_path); SCR::Execute (.target.bash, command, $["LANG" : "C"]); }); + y2milestone ("signing content file..."); while (true) { // sign the content file @@ -2283,6 +2296,7 @@ } else break; } + y2milestone ("... done"); SCR::Execute (.target.bash, sformat("gpg --export -a %1 > '%2/content.key'",local_key, base_path)); @@ -2290,6 +2304,7 @@ // sign the packages if (current_product["resign_packages"]:false) { + y2milestone ("signing the packages..."); string expect = tmpdir + "/sign.ex"; SCR::Write (.target.string, expect, sformat (expect_script, key, passphrase)); @@ -2303,20 +2318,42 @@ out = (map) SCR::Execute (.target.bash_output, cmd); } }); + y2milestone ("... done"); SCR::Execute (.target.bash, sformat ("rm %1", expect)); + // after signing packages checksums have changed: + // run create_package_descr again and take new 'packages' file + y2milestone ("updating packages descriptions..."); + string cmd = sformat("/usr/bin/create_package_descr -d %1 -C -F -o %2", + full_data_path, tmpdir); + if (SCR::Execute (.target.bash, cmd, $["LANG":"C"]) == 0) + { + cmd = sformat ("/bin/cp %1/packages '%2'", tmpdir, full_descr_path); + SCR::Execute (.target.bash, cmd, $["LANG":"C"]); + if (compress_package_descriptions) + { + SCR::Execute (.target.bash, + sformat ("gzip %1/packages", full_descr_path)); + } + } + else + { + y2warning ("'%1' failed", cmd); + } + y2milestone ("... done"); } - // sign products file string products_path = full_media_paths[0]:"" + "/products"; if (FileUtils::Exists (products_path)) { + y2milestone ("signing products file..."); SCR::Execute (.target.bash, sformat ("rm -f '%1.asc'", products_path)); SCR::Execute (.target.bash, sformat("gpg --batch --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2' < %3", local_key, products_path, pw_path)); SCR::Execute (.target.bash, sformat("gpg --export -a %1 > '%2.key'", local_key,products_path)); + y2milestone ("... done"); } SCR::Execute (.target.remove, pw_path); return true; @@ -2330,11 +2367,13 @@ if (!FileUtils::Exists (base_path)) return false; + y2milestone ("creating directory.yast files..."); foreach (string dir, (list<string>) merge ( [base_path, full_descr_path], full_media_paths), { SCR::Execute (.target.bash_output, sformat ("cd '%1'; ls -A1 -p | grep -v 'directory.yast' > directory.yast", dir), $["LANG" : "C"]); }); + y2milestone ("... done"); return true; } @@ -2355,13 +2394,18 @@ name = name + ".iso"; current_product["iso_name"] = name; // ?? + y2milestone ("creating iso image '%1/%2' from '%3' with mkisofs...", + iso_p, name, dir_path); + // possible options -allow-leading-dots - string cmd = sformat("mkisofs -r -J -l -o '%1/%2' '%3'",iso_p, name, dir_path); + string cmd = sformat("mkisofs -r -J -l -o '%1/%2' '%3'", + iso_p, name, dir_path); map out = (map) SCR::Execute (.target.bash_output, cmd); if (out["exit"]:0 != 0) { y2warning ("%1 returned %2", cmd, out); } + y2milestone ("... done"); return true; } @@ -2394,6 +2438,8 @@ */ global void CommitCurrentProduct () { + y2milestone ("saving current product to the global list"); + map modified_product = union (current_product, $[ "content_map" : content_map, "available_packages" : available_packages, @@ -2459,6 +2505,7 @@ }); return product; }); + y2milestone ("writing list of configured products"); return SCR::Write (.target.ycp, add_on_products_file, add_on_products); } -- 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] r49700 - /tags/stable-2_17_3/add-on-creator/
by jsuchome＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: jsuchome Date: Tue Aug 5 13:26:53 2008 New Revision: 49700 URL: http://svn.opensuse.org/viewcvs/yast?rev=49700&view=rev Log: Created tag stable-2_17_3 for add-on-creator Added: tags/stable-2_17_3/add-on-creator/ - copied from r49699, trunk/add-on-creator/ -- 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] r49699 - in /trunk/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: jsuchome Date: Tue Aug 5 13:26:49 2008 New Revision: 49699 URL: http://svn.opensuse.org/viewcvs/yast?rev=49699&view=rev Log: - recreate package metadata after signing RPMs (bnc#412591) - more logging during write phase - 2.17.3 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=49699… ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Tue Aug 5 13:26:49 2008 @@ -1 +1 @@ -2.17.2 +2.17.3 Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add… ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Tue Aug 5 13:26:49 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 5 12:46:55 CEST 2008 - jsuchome(a)suse.cz + +- recreate package metadata after signing RPMs (bnc#412591) +- more logging during write phase +- 2.17.3 + +------------------------------------------------------------------- Mon Jul 14 09:52:18 CEST 2008 - jsuchome(a)suse.cz - read all content file values from saved configuration (bnc#406153) Modified: trunk/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.… ============================================================================== --- trunk/add-on-creator/src/AddOnCreator.ycp (original) +++ trunk/add-on-creator/src/AddOnCreator.ycp Tue Aug 5 13:26:49 2008 @@ -43,7 +43,6 @@ import "Package"; import "PackageSystem"; import "PackagesDescr"; -import "Popup"; import "Progress"; import "Report"; import "String"; @@ -1618,11 +1617,14 @@ if (!FileUtils::Exists (descr_path)) return false; + y2milestone ("writing package description files..."); + boolean ret = true; if (descr == $[]) return ret; foreach (string lang, map data, (map<string,map>)descr, { string file_path = descr_path + "/packages." + lang; ret = ret && PackagesDescr::Write (file_path,(map<string,any>)data); + y2debug ("file '%1' written, retval: %2", file_path, ret); if (compress_package_descriptions && gzip_installed ()) { y2debug ("compressing %1 file: %2", file_path, SCR::Execute ( @@ -1636,6 +1638,7 @@ descr_path)); foreach (string file, [ "packages", "packages.DU", "packages.FL"], { string pth = tmpdir + "/" + file; + y2debug ("processing '%1'", pth); boolean compress = false; if (!FileUtils::Exists (pth) && FileUtils::Exists (pth + ".gz")) pth = pth + ".gz"; @@ -1651,14 +1654,11 @@ }); } - /* no need to read now, already done in UI or CLI - if (extra_prov_file != "" && FileUtils::Exists (extra_prov_file)) - extra_prov = (string) SCR::Read (.target.string, extra_prov_file); - */ string extra_prov = current_product["extra_prov"]:""; if (extra_prov != "" && extra_prov != nil) SCR::Write (.target.string, descr_path + "/EXTRA_PROV",extra_prov); + y2milestone ("... done"); return ret; } @@ -1788,7 +1788,7 @@ y2warning ("no %1 directory exists...", base_path); return false; } - + y2milestone ("writing licenses..."); boolean ret = true; string cmd = ""; foreach (string file, string cont, files, { @@ -1879,7 +1879,9 @@ file = file + sformat ("+%1:\n%2\n-%1:\n", key, val); } }); - SCR::Write (.target.string, descr_path + "/" + filename, file); + y2milestone ("writing pattern %1/%2: %3", descr_path, filename, + SCR::Write (.target.string, descr_path + "/" + filename, file) + ); if (compress_patterns && gzip_installed ()) { y2debug ("compressing pattern file: %1", SCR::Execute ( @@ -1926,12 +1928,14 @@ if (arch != "ZZZ_imported" && arch != "ZZZ_required" && FileUtils::Exists (out_dir)) { + y2milestone ("copying packages of '%1' arhitecture", arch); // arch_directories will be needed later for CreateMD5SUMS and // resign_packages arch_directories = (list<string>) union (arch_directories, [arch]); if (size (package2filename) > 0 && arch != "src") { + y2debug ("package names known"); foreach (string p, (list<string>) pa, { SCR::Execute (.target.bash, sformat ( "/bin/cp %1 '%2/'", package2filename[arch,p]:"", out_dir)); @@ -1939,6 +1943,7 @@ } else if (size (srcpackage2filename) > 0 && arch == "src") { + y2debug ("source packages, names known"); foreach (string p, (list<string>) pa, { SCR::Execute (.target.bash, sformat ( "/bin/cp %1 '%2/'", srcpackage2filename[arch,p]:"", out_dir)); @@ -1946,6 +1951,7 @@ } else { + y2debug ("package names not known, using wildcard"); foreach (string p, (list<string>) pa, { SCR::Execute (.target.bash, sformat ( "/bin/cp %1/%2*.rpm '%3/'", in_path, p, out_dir)); @@ -2017,7 +2023,7 @@ boolean GenerateChangelog (string base_path) { if (!Package::Installed ("inst-source-utils") && - !FileUtils::Exists ("/usr/bin//usr/bin/mk_changelog")) + !FileUtils::Exists ("/usr/bin/mk_changelog")) { y2error("inst-source-utils not installed and mk_changelog not present"); return false; @@ -2112,6 +2118,7 @@ foreach (string full_path, dirs_for_md5, { if (dir_has_files (full_path)) { + y2milestone ("creating MDBSUM in %1", full_path); // whole dir was copied -> also with original MD5SUMS if (FileUtils::Exists (full_path + "/MD5SUMS")) { @@ -2129,6 +2136,7 @@ map out = (map) SCR::Execute (.target.bash_output, sformat ("ls -A1 '%1'", full_descr_path)); foreach (string file, splitstring (out["stdout"]:"", "\n"), { if (file == "") return; + y2milestone ("creating sha1sum of %1", file); out = (map) SCR::Execute (.target.bash_output, sformat ("cd '%1' && sha1sum -- %2", full_descr_path, String::Quote (file)), $["LANG" : "C"]); @@ -2138,10 +2146,12 @@ }); // sha1sums of the rest of interesting files - foreach (string file, [ "installation.xml", "license.tar.gz", "media.1/info.txt"], + foreach (string file, [ "installation.xml", "license.tar.gz", + "media.1/info.txt"], { if (FileUtils::Exists (base_path + "/" + file)) { + y2milestone ("creating sha1sum of %1", file); out = (map) SCR::Execute (.target.bash_output, sformat ("cd '%1' && sha1sum -- %2", base_path, String::Quote (file)), $["LANG" : "C"]); string command = sformat ("echo 'HASH SHA1 %1' >> '%2/content'", @@ -2212,7 +2222,9 @@ } /** - * Sign the add-on + * Sign current Add-On product + * @param base_path path to target product directory + * @param key GPG key to sign with */ global boolean SignAddOn (string base_path, string key) { @@ -2252,6 +2264,7 @@ deletechars (out["stdout"]:"", "\n"), base_path); SCR::Execute (.target.bash, command, $["LANG" : "C"]); }); + y2milestone ("signing content file..."); while (true) { // sign the content file @@ -2278,6 +2291,7 @@ } else break; } + y2milestone ("... done"); SCR::Execute (.target.bash, sformat("gpg --export -a %1 > '%2/content.key'",local_key, base_path)); @@ -2285,6 +2299,7 @@ // sign the packages if (current_product["resign_packages"]:false) { + y2milestone ("signing the packages..."); string expect = tmpdir + "/sign.ex"; SCR::Write (.target.string, expect, sformat (expect_script, key, passphrase)); @@ -2298,20 +2313,42 @@ out = (map) SCR::Execute (.target.bash_output, cmd); } }); + y2milestone ("... done"); SCR::Execute (.target.bash, sformat ("rm %1", expect)); + // after signing packages checksums have changed: + // run create_package_descr again and take new 'packages' file + y2milestone ("updating packages descriptions..."); + string cmd = sformat("/usr/bin/create_package_descr -d %1 -C -F -o %2", + full_data_path, tmpdir); + if (SCR::Execute (.target.bash, cmd, $["LANG":"C"]) == 0) + { + cmd = sformat ("/bin/cp %1/packages '%2'", tmpdir, full_descr_path); + SCR::Execute (.target.bash, cmd, $["LANG":"C"]); + if (compress_package_descriptions) + { + SCR::Execute (.target.bash, + sformat ("gzip %1/packages", full_descr_path)); + } + } + else + { + y2warning ("'%1' failed", cmd); + } + y2milestone ("... done"); } - // sign products file string products_path = full_media_paths[0]:"" + "/products"; if (FileUtils::Exists (products_path)) { + y2milestone ("signing products file..."); SCR::Execute (.target.bash, sformat ("rm -f '%1.asc'", products_path)); SCR::Execute (.target.bash, sformat("gpg --batch --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2' < %3", local_key, products_path, pw_path)); SCR::Execute (.target.bash, sformat("gpg --export -a %1 > '%2.key'", local_key,products_path)); + y2milestone ("... done"); } SCR::Execute (.target.remove, pw_path); return true; @@ -2325,11 +2362,13 @@ if (!FileUtils::Exists (base_path)) return false; + y2milestone ("creating directory.yast files..."); foreach (string dir, (list<string>) merge ( [base_path, full_descr_path], full_media_paths), { SCR::Execute (.target.bash_output, sformat ("cd '%1'; ls -A1 -p | grep -v 'directory.yast' > directory.yast", dir), $["LANG" : "C"]); }); + y2milestone ("... done"); return true; } @@ -2350,13 +2389,18 @@ name = name + ".iso"; current_product["iso_name"] = name; // ?? + y2milestone ("creating iso image '%1/%2' from '%3' with mkisofs...", + iso_p, name, dir_path); + // possible options -allow-leading-dots - string cmd = sformat("mkisofs -r -J -l -o '%1/%2' '%3'",iso_p, name, dir_path); + string cmd = sformat("mkisofs -r -J -l -o '%1/%2' '%3'", + iso_p, name, dir_path); map out = (map) SCR::Execute (.target.bash_output, cmd); if (out["exit"]:0 != 0) { y2warning ("%1 returned %2", cmd, out); } + y2milestone ("... done"); return true; } @@ -2389,6 +2433,8 @@ */ global void CommitCurrentProduct () { + y2milestone ("saving current product to the global list"); + map modified_product = union (current_product, $[ "content_map" : content_map, "available_packages" : available_packages, @@ -2454,6 +2500,7 @@ }); return product; }); + y2milestone ("writing list of configured products"); return SCR::Write (.target.ycp, add_on_products_file, add_on_products); } -- 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] r49698 - /trunk/doc/tdg/ycp/ycp_detail.xml
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 13:20:47 2008 New Revision: 49698 URL: http://svn.opensuse.org/viewcvs/yast?rev=49698&view=rev Log: Fixing example Modified: trunk/doc/tdg/ycp/ycp_detail.xml Modified: trunk/doc/tdg/ycp/ycp_detail.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/tdg/ycp/ycp_detail.xml?rev=4… ============================================================================== --- trunk/doc/tdg/ycp/ycp_detail.xml (original) +++ trunk/doc/tdg/ycp/ycp_detail.xml Tue Aug 5 13:20:47 2008 @@ -1611,12 +1611,12 @@ integer three = map_of_lists["a", 2]:0; list <map <integer, integer> > list_of_maps = [ - $[1:2], - $[3:4], - $[5:6] + $[0:1], + $[2:3], + $[4:5] ]; // returns true - return (list_of_maps[1,0]:0 == three); + return (list_of_maps[1,2]:0 == three); }</programlisting> </para> </section> -- 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] r49697 - /branches/SuSE-Linux-11_0-Branch/doc/tdg/ycp/ycp_detail.xml
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 13:13:57 2008 New Revision: 49697 URL: http://svn.opensuse.org/viewcvs/yast?rev=49697&view=rev Log: Fixing example Modified: branches/SuSE-Linux-11_0-Branch/doc/tdg/ycp/ycp_detail.xml Modified: branches/SuSE-Linux-11_0-Branch/doc/tdg/ycp/ycp_detail.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/doc/td… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/doc/tdg/ycp/ycp_detail.xml (original) +++ branches/SuSE-Linux-11_0-Branch/doc/tdg/ycp/ycp_detail.xml Tue Aug 5 13:13:57 2008 @@ -1611,12 +1611,12 @@ integer three = map_of_lists["a", 2]:0; list <map <integer, integer> > list_of_maps = [ - $[1:2], - $[3:4], - $[5:6] + $[0:1], + $[2:3], + $[4:5] ]; // returns true - return (list_of_maps[1,0]:0 == three); + return (list_of_maps[1,2]:0 == three); }</programlisting> </para> </section> -- 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] r49696 - in /trunk/packager: package/yast2-packager.changes src/clients/inst_productsources.ycp
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 12:57:49 2008 New Revision: 49696 URL: http://svn.opensuse.org/viewcvs/yast?rev=49696&view=rev Log: - Reporting 'no network is running' when calling Community Repositories without network in mode 'normal' (bnc #327519). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_productsources.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Aug 5 12:57:49 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 5 12:55:59 CEST 2008 - locilka(a)suse.cz + +- Reporting 'no network is running' when calling Community + Repositories without network in mode 'normal' (bnc #327519). + +------------------------------------------------------------------- Mon Aug 4 11:51:28 CEST 2008 - locilka(a)suse.cz - Community Repositories: listing recommended repositories first Modified: trunk/packager/src/clients/inst_productsources.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_produc… ============================================================================== --- trunk/packager/src/clients/inst_productsources.ycp (original) +++ trunk/packager/src/clients/inst_productsources.ycp Tue Aug 5 12:57:49 2008 @@ -244,6 +244,14 @@ boolean NetworkRunning () { boolean ret = false; + // bnc #327519 + if (Mode::normal ()) { + if (! NetworkService::isNetworkRunning()) { + y2warning ("No network is running..."); + return false; + } + } + while (true) { if (NetworkService::isNetworkRunning()) { ret = true; -- 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] r49695 - in /trunk/storage/libstorage/src: EvmsCo.cc Storage.cc Storage.h
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 12:47:16 2008 New Revision: 49695 URL: http://svn.opensuse.org/viewcvs/yast?rev=49695&view=rev Log: - removed more evms code Modified: trunk/storage/libstorage/src/EvmsCo.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h Modified: trunk/storage/libstorage/src/EvmsCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EvmsCo.cc… ============================================================================== --- trunk/storage/libstorage/src/EvmsCo.cc (original) +++ trunk/storage/libstorage/src/EvmsCo.cc Tue Aug 5 12:47:16 2008 @@ -1244,12 +1244,7 @@ bool EvmsCo::canDoEvms() { - bool ret = access( EXEC_PATH, X_OK )==0 && - getenv( "YAST2_STORAGE_NO_EVMS" )==NULL && - !Storage::getNoEv(); - ret = false; // hard disable EVMS - y2mil( "ret:" << ret ); - return( ret ); + return false; } void EvmsCo::activate( bool val ) Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Tue Aug 5 12:47:16 2008 @@ -2881,486 +2881,6 @@ return( ret ); } -static bool isEvms( const Volume& v ) - { - return( v.cType()==EVMS ); - } - -static bool evmsCo( const EvmsCo& co ) - { - y2mil( "co:" << co ); - y2mil( "isContainer:" << co.isContainer() ); - return( co.isContainer()); - } - -static bool isDiskCreated( const Volume& v ) - { - return( v.cType()==DISK && v.created() ); - } - -int Storage::evmsActivate( bool forced ) - { - int ret = 0; - assertInit(); - y2mil( "start forced:" << forced ); - if( readonly ) - { - ret = STORAGE_CHANGE_READONLY; - } - else - { - ConstEvmsPair p = evmsPair(evmsCo); - if( !p.empty() && !forced ) - { - y2warning( "evms already active:%u", p.length() ); - for( ConstEvmsIterator ei=p.begin(); ei!=p.end(); ++ei ) - y2war( "vol:" << *ei ); - } - else - { - ret = EvmsCo::activateDevices(); - if( ret==0 ) - { - detectEvms(); - VPair p = vPair( isEvms ); - ProcMounts pm( this ); - detectFsData( p.begin(), p.end(), pm ); - EvmsCoPair ep = evCoPair(); - EvmsCoIterator coi = ep.begin(); - while( coi!=ep.end() && coi->device()!="/dev/evms" ) - ++coi; - if( coi!=ep.end() ) - { - EvmsCo::EvmsPair vp = coi->evmsPair(EvmsCo::lvNotDeleted); - EvmsCo::EvmsIter ei = vp.begin(); - p = vPair( Volume::isDeleted ); - while( ei!=vp.end() ) - { - y2mil( "ev:" << *ei ); - string dev = EvmsCo::evmsToDev( ei->device() ); - y2mil( "disk dev:" << dev ); - VolIterator vi = p.begin(); - while( vi!=p.end() && - (!vi->deleted() || vi->device()!=dev) ) - ++vi; - if( vi!=p.end() ) - { - const Partition* p = dynamic_cast<const Partition *>(&(*vi)); - y2mil( "ev del:" << *vi ); - y2mil( "part del:" <disk(), vi->device(), false ); - } - } - ++ei; - } - } - p = vPair( isDiskCreated ); - VolIterator vi=p.begin(); - while( vi!=p.end() ) - { - y2mil( "vi:" << *vi ); - Partition* p = dynamic_cast<Partition *>(&(*vi)); - y2mil( "part del:" <disk()->device(), - vi->device(), - p->type()==EXTENDED ); - } - ++vi; - } - ep = evCoPair(evmsCo); - coi = ep.begin(); - list<string> rem_co; - while( coi!=ep.end()) - { - if( coi->name().find( "lvm/" )==0 || - coi->name().find( "lvm2/" )==0 ) - { - string n = coi->name(); - y2mil("n:"<<n); - n.erase(0,n.find('/')+1); - y2mil("n:"<<n); - ContIterator cc; - if( findContainer( "/dev/"+n, cc ) && cc->deleted()) - rem_co.push_back( coi->device() ); - } - ++coi; - } - if( rem_co.size()>0 ) - { - y2mil("rem_co:" << rem_co); - for( list<string>::iterator s = rem_co.begin(); - s!=rem_co.end(); s++ ) - { - ContIterator cc; - if( findContainer( *s, cc )) - removeContainer( &(*cc) ); - } - } - std::map<string,CCont>::iterator i=backups.find("initial"); - if( !evCoPair().empty() && i!=backups.end() ) - { - std::list<Container*>::iterator ci=i->second.begin(); - while( ci!=i->second.end() && (*ci)->device()!="/dev/evms" ) - ++ci; - if( ci==i->second.end() ) - { - ep = evCoPair(evmsCo); - coi = ep.begin(); - while( coi != ep.end() ) - { - ci=i->second.begin(); - while( ci!=i->second.end() && (*ci)->device()!=coi->device() ) - ++ci; - if( ci==i->second.end() ) - { - EvmsCo* co = new EvmsCo( *coi ); - y2mil( "adding:" << co->device() ); - logCo( co ); - i->second.push_back( co ); - } - ++coi; - } - } - } - } - } - } - y2milestone( "ret:%d", ret ); - return( ret ); - } - -int -Storage::createEvmsContainer( const string& name, unsigned long long peSizeK, - bool lvm1, const deque<string>& devs ) - { - int ret = 0; - assertInit(); - y2mil( "name:" << name << " peSizeK:" << peSizeK << " lvm1:" << lvm1 << - " devices:" << devs ); - EvmsCoIterator i = findEvmsCo( name ); - if( readonly ) - { - ret = STORAGE_CHANGE_READONLY; - } - if( name.empty() || - name.find_first_of( "\"\' /\n\t:*?" ) != string::npos ) - { - ret = STORAGE_EVMS_INVALID_NAME; - } - else if( i == evCoEnd() ) - { - EvmsCo *v = new EvmsCo( this, name, lvm1 ); - v->setCreated(); - ret = v->EvmsCo::setPeSize( peSizeK ); - if( ret==0 && !devs.empty() ) - { - list<string> d; - back_insert_iterator<list<string> > inserter(d); - copy( devs.begin(), devs.end(), inserter ); - ret = v->extendCo( d ); - } - if( ret==0 ) - addToList( v ); - else - delete( v ); - } - else - { - ret = STORAGE_EVMS_CO_EXISTS; - } - if( ret==0 ) - { - ret = checkCache(); - } - y2milestone( "ret:%d", ret ); - return( ret ); - } - -int -Storage::modifyEvmsContainer( const string& old_name, const string& new_name, - unsigned long long peSizeK, bool lvm1 ) - { - int ret = 0; - assertInit(); - y2mil( "old name:" << old_name << " new name:" << new_name << - " peSizeK:" << peSizeK << " lvm1:" << lvm1 ); - EvmsCoIterator i = findEvmsCo( old_name ); - if( readonly ) - { - ret = STORAGE_CHANGE_READONLY; - } - if( new_name.empty() || - new_name.find_first_of( "\"\' /\n\t:*?" ) != string::npos ) - { - ret = STORAGE_EVMS_INVALID_NAME; - } - else if( i != evCoEnd() ) - { - y2mil( "orig co:" << *i ); - ret = i->modifyCo( new_name, peSizeK, lvm1 ); - if( ret==0 ) - { - y2mil( "modi co:" << *i ); - Container *v = &(*i); - ret = removeContainer( v, false ); - addToList( v ); - } - } - else - { - ret = STORAGE_EVMS_CO_NOT_FOUND; - } - if( ret==0 ) - { - ret = checkCache(); - } - y2milestone( "ret:%d", ret ); - return( ret ); - } - -int -Storage::removeEvmsContainer( const string& name ) - { - int ret = 0; - assertInit(); - y2milestone( "name:%s", name.c_str() ); - EvmsCoIterator i = findEvmsCo( name ); - if( readonly ) - { - ret = STORAGE_CHANGE_READONLY; - } - else if( i != evCoEnd() ) - { - ret = i->removeCo(); - if( ret==0 && i->created() ) - ret = removeContainer( &(*i) ); - if( ret==0 ) - { - string lvn = name; - if( lvn.find( '/' )!=string::npos ) - lvn = lvn.substr( lvn.find( '/' )+1 ); - LvmVgIterator l = findLvmVg( lvn ); - if( l!=lvgEnd() ) - { - removeContainer( &(*l) ); - } - } - } - else - { - ret = STORAGE_EVMS_CO_NOT_FOUND; - } - if( ret==0 ) - { - ret = checkCache(); - } - y2milestone( "ret:%d", ret ); - return( ret ); - } - -int -Storage::extendEvmsContainer( const string& name, const deque<string>& devs ) - { - int ret = 0; - assertInit(); - y2mil( "name:" << name << " devices:" << devs ); - EvmsCoIterator i = findEvmsCo( name ); - if( readonly ) - { - ret = STORAGE_CHANGE_READONLY; - } - else if( i != evCoEnd() ) - { - list<string> d; - back_insert_iterator<list<string> > inserter(d); - copy( devs.begin(), devs.end(), inserter ); - ret = i->extendCo( d ); - } - else - { - ret = STORAGE_EVMS_CO_NOT_FOUND; - } - if( ret==0 ) - { - ret = checkCache(); - } - y2milestone( "ret:%d", ret ); - return( ret ); - } - -int -Storage::shrinkEvmsContainer( const string& name, const deque<string>& devs ) - { - int ret = 0; - assertInit(); - y2mil( "name:" << name << " devices:" << devs ); - EvmsCoIterator i = findEvmsCo( name ); - if( readonly ) - { - ret = STORAGE_CHANGE_READONLY; - } - else if( i != evCoEnd() ) - { - list<string> d; - back_insert_iterator<list<string> > inserter(d); - copy( devs.begin(), devs.end(), inserter ); - ret = i->reduceCo( d ); - } - else - { - ret = STORAGE_EVMS_CO_NOT_FOUND; - } - if( ret==0 ) - { - ret = checkCache(); - } - y2milestone( "ret:%d", ret ); - return( ret ); - } - -int -Storage::createEvmsVolume( const string& co, const string& name, - unsigned long long sizeM, unsigned stripe, - string& device ) - { - int ret = 0; - assertInit(); - y2milestone( "co:%s name:%s sizeM:%llu stripe:%u", co.c_str(), - name.c_str(), sizeM, stripe ); - EvmsCoIterator i = findEvmsCo( co ); - if( readonly ) - { - ret = STORAGE_CHANGE_READONLY; - } - else if( i != evCoEnd() ) - { - ret = i->createVol( name, sizeM*1024, stripe, device ); - } - else - { - ret = STORAGE_EVMS_CO_NOT_FOUND; - } - if( ret==0 ) - { - ret = checkCache(); - } - y2milestone( "ret:%d device:%s", ret, ret?"":device.c_str() ); - return( ret ); - } - -int -Storage::removeEvmsVolumeByDevice( const string& device ) - { - int ret = 0; - string co, name; - string d = undevDevice( device ); - if( d.find( "evms/" )==0 ) - d.erase( 0, 5 ); - string::size_type pos = d.find( '/' ); - pos = d.find( '/', pos+1 ); - if( pos!=string::npos ) - { - co = d.substr( 0, pos ); - name = d.substr( pos+1 ); - } - if( !co.empty() && !name.empty() ) - ret = removeEvmsVolume( co, name ); - else - ret = STORAGE_EVMS_INVALID_DEVICE; - y2milestone( "ret:%d", ret ); - return( ret ); - } - -int -Storage::removeEvmsVolume( const string& co, const string& name ) - { - int ret = 0; - assertInit(); - y2milestone( "co:%s name:%s", co.c_str(), name.c_str() ); - EvmsCoIterator i = findEvmsCo( co ); - if( readonly ) - { - ret = STORAGE_CHANGE_READONLY; - } - else if( i != evCoEnd() ) - { - ret = i->removeVol( name ); - } - else - { - ret = STORAGE_EVMS_CO_NOT_FOUND; - } - if( ret==0 ) - { - ret = checkCache(); - } - y2milestone( "ret:%d", ret ); - return( ret ); - } - -int -Storage::changeEvmsStripeCount( const string& coname, const string& name, - unsigned long stripe ) - { - int ret = 0; - assertInit(); - y2milestone( "co:%s name:%s stripe:%lu", coname.c_str(), name.c_str(), - stripe ); - EvmsCoIterator i = findEvmsCo( coname ); - if( readonly ) - { - ret = STORAGE_CHANGE_READONLY; - } - else if( i != evCoEnd() ) - { - ret = i->changeStripe( name, stripe ); - } - else - { - ret = STORAGE_EVMS_CO_NOT_FOUND; - } - if( ret==0 ) - { - ret = checkCache(); - } - y2milestone( "ret:%d", ret ); - return( ret ); - } - -int -Storage::changeEvmsStripeSize( const string& coname, const string& name, - unsigned long long stripeSize ) - { - int ret = 0; - assertInit(); - y2milestone( "co:%s name:%s stripeSize:%llu", coname.c_str(), - name.c_str(), stripeSize ); - EvmsCoIterator i = findEvmsCo( coname ); - if( readonly ) - { - ret = STORAGE_CHANGE_READONLY; - } - else if( i != evCoEnd() ) - { - ret = i->changeStripeSize( name, stripeSize ); - } - else - { - ret = STORAGE_EVMS_CO_NOT_FOUND; - } - if( ret==0 ) - { - ret = checkCache(); - } - y2milestone( "ret:%d", ret ); - return( ret ); - } int Storage::nextFreeMd(int &nr, string &device) @@ -4834,35 +4354,6 @@ return( ret ); } -int Storage::getEvmsCoInfo( const string& name, EvmsCoInfo& info ) - { - int ret = 0; - assertInit(); - EvmsCoIterator i = findEvmsCo( name ); - if( i != evCoEnd() ) - { - i->getInfo( info ); - } - else - ret = STORAGE_EVMS_CO_NOT_FOUND; - return( ret ); - } - -int Storage::getContEvmsCoInfo( const string& name, ContainerInfo& cinfo, - EvmsCoInfo& info ) - { - int ret = 0; - assertInit(); - EvmsCoIterator i = findEvmsCo( name ); - if( i != evCoEnd() ) - { - ((const Container*)&(*i))->getInfo( cinfo ); - i->getInfo( info ); - } - else - ret = STORAGE_EVMS_CO_NOT_FOUND; - return( ret ); - } int Storage::getDmraidCoInfo( const string& name, DmraidCoInfo& info ) { @@ -4894,26 +4385,6 @@ return( ret ); } -int Storage::getEvmsInfo( const string& name, - deque<storage::EvmsInfo>& plist ) - { - int ret = 0; - plist.clear(); - assertInit(); - EvmsCoIterator i = findEvmsCo( name ); - if( i != evCoEnd() ) - { - EvmsCo::EvmsPair p = i->evmsPair(EvmsCo::lvNotDeleted); - for( EvmsCo::EvmsIter i2 = p.begin(); i2 != p.end(); ++i2 ) - { - plist.push_back( EvmsInfo() ); - i2->getInfo( plist.back() ); - } - } - else - ret = STORAGE_EVMS_CO_NOT_FOUND; - return( ret ); - } int Storage::getMdInfo( deque<storage::MdInfo>& plist ) { @@ -5897,12 +5368,6 @@ case UB_DMRAID: //ret = removeDmraidCo( name ); break; - case UB_EVMS: - if( !name.empty() ) - ret = removeEvmsContainer( name ); - else - ret = removeVolume( "/dev/evms/" + name ); - break; case UB_NONE: y2warning( "%s used by none", device.c_str() ); break; @@ -6543,12 +6008,6 @@ } } -void Storage::setNoEvms( bool val ) - { - y2mil( "val:" << val ); - no_evms=val; - } - string Storage::byteToHumanString(unsigned long long size, bool classic, int precision, bool omit_zeroes) const @@ -6580,5 +6039,3 @@ storage::CallbackShowInstallInfo Storage::install_info_cb_ycp; storage::CallbackInfoPopup Storage::info_popup_cb_ycp; storage::CallbackYesNoPopup Storage::yesno_popup_cb_ycp; -bool Storage::no_evms; - Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Tue Aug 5 12:47:16 2008 @@ -263,15 +263,11 @@ void getContainers( deque<storage::ContainerInfo>& infos ); int getDiskInfo( const string& disk, storage::DiskInfo& info); int getLvmVgInfo( const string& name, storage::LvmVgInfo& info); - int getEvmsCoInfo( const string& name, storage::EvmsCoInfo& info); int getDmraidCoInfo( const string& name, storage::DmraidCoInfo& info); int getContDiskInfo( const string& disk, storage::ContainerInfo& cinfo, storage::DiskInfo& info); int getContLvmVgInfo( const string& name, storage::ContainerInfo& cinfo, storage::LvmVgInfo& info); - int getContEvmsCoInfo( const string& name, - storage::ContainerInfo& cinfo, - storage::EvmsCoInfo& info ); int getContDmraidCoInfo( const string& name, storage::ContainerInfo& cinfo, storage::DmraidCoInfo& info ); @@ -281,8 +277,6 @@ deque<storage::PartitionInfo>& plist ); int getLvmLvInfo( const string& name, deque<storage::LvmLvInfo>& plist ); - int getEvmsInfo( const string& name, - deque<storage::EvmsInfo>& plist ); int getMdInfo( deque<storage::MdInfo>& plist ); int getDmInfo( deque<storage::DmInfo>& plist ); int getNfsInfo( deque<storage::NfsInfo>& plist ); @@ -403,27 +397,6 @@ int changeLvStripeSize( const string& vg, const string& name, unsigned long long stripeSize ); - int evmsActivate( bool force ); - int createEvmsContainer( const string& name, unsigned long long peSizeK, - bool lvm1, const deque<string>& devs ); - int modifyEvmsContainer( const string& old_name, const string& new_name, - unsigned long long peSizeK, bool lvm1 ); - int removeEvmsContainer( const string& name ); - int extendEvmsContainer( const string& name, const deque<string>& devs ); - int shrinkEvmsContainer( const string& name, const deque<string>& devs ); - int createEvmsVolume( const string& vg, const string& name, - unsigned long long sizeM, unsigned stripe, - string& device ); - int removeEvmsVolumeByDevice( const string& device ); - int removeEvmsVolume( const string& vg, const string& name ); - int changeEvmsStripeCount( const string& coname, const string& name, - unsigned long stripes ); - int changeEvmsStripeSize( const string& coname, const string& name, - unsigned long long stripeSize ); - void setNoEvms( bool val ); - bool getNoEvms() { return( no_evms ); } - static bool getNoEv() { return( no_evms ); } - int nextFreeMd(int &nr, string &device); int createMd( const string& name, storage::MdType rtype, const deque<string>& devs ); -- 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] r49694 - /tags/stable-2_17_9/bootloader/
by juhliarik＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: juhliarik Date: Tue Aug 5 12:44:58 2008 New Revision: 49694 URL: http://svn.opensuse.org/viewcvs/yast?rev=49694&view=rev Log: Created tag stable-2_17_9 for bootloader Added: tags/stable-2_17_9/bootloader/ - copied from r49693, trunk/bootloader/ -- 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] r49693 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes
by juhliarik＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: juhliarik Date: Tue Aug 5 12:44:49 2008 New Revision: 49693 URL: http://svn.opensuse.org/viewcvs/yast?rev=49693&view=rev Log: new version 2.17.9 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=49693&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Tue Aug 5 12:44:49 2008 @@ -1 +1 @@ -2.17.8 +2.17.9 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Aug 5 12:44:49 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 5 12:05:04 CEST 2008 - juhliarik(a)suse.cz + +- added/enabled support for ordering disks in device.map for GRUB + (fate ##303964) +- 2.17.9 + +------------------------------------------------------------------- Mon Aug 4 13:29:01 CEST 2008 - juhliarik(a)suse.cz - added support for reducing devices from device.map to 8 devices -- 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] r49692 - /trunk/storage/libstorage/src/Disk.cc
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 12:34:25 2008 New Revision: 49692 URL: http://svn.opensuse.org/viewcvs/yast?rev=49692&view=rev Log: - updated help text Modified: trunk/storage/libstorage/src/Disk.cc Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Tue Aug 5 12:34:25 2008 @@ -871,7 +871,7 @@ " \'hwprobe=-modules.pata\' as argument to the kernel\n" " - Repartition your system so that maximal 15 partitions are used.\n" " To repartition, use your existing operating system.\n" -" - Use LVM/EVMS since they can provide an arbitrary and flexible\n" +" - Use LVM since it can provide an arbitrary and flexible\n" " number of block devices partitions. This needs a repartition\n" " as well."); } -- 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] r49691 - in /trunk/storage: libstorage/bindings/ycp/LibStorage.i storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 12:31:04 2008 New Revision: 49691 URL: http://svn.opensuse.org/viewcvs/yast?rev=49691&view=rev Log: - don't generate swig stuff for obsolete evms structs Modified: trunk/storage/libstorage/bindings/ycp/LibStorage.i trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/libstorage/bindings/ycp/LibStorage.i URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/bindings/ycp/… ============================================================================== --- trunk/storage/libstorage/bindings/ycp/LibStorage.i (original) +++ trunk/storage/libstorage/bindings/ycp/LibStorage.i Tue Aug 5 12:31:04 2008 @@ -19,12 +19,10 @@ specialize_sequence(storage::ContainerInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::DiskInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::LvmVgInfo, TO_PACK, FROM_PACK, CHECK) -specialize_sequence(storage::EvmsCoInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::VolumeInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::PartitionInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::PartitionAddInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::LvmLvInfo, TO_PACK, FROM_PACK, CHECK) -specialize_sequence(storage::EvmsInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::MdInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::MdStateInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::LoopInfo, TO_PACK, FROM_PACK, CHECK) Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Aug 5 12:31:04 2008 @@ -51,7 +51,6 @@ import "LibStorage::VolumeInfo"; import "LibStorage::PartitionInfo"; import "LibStorage::LvmLvInfo"; - import "LibStorage::EvmsInfo"; import "LibStorage::MdInfo"; import "LibStorage::LoopInfo"; import "LibStorage::DmInfo"; @@ -61,7 +60,6 @@ import "LibStorage::ContainerInfo"; import "LibStorage::DiskInfo"; import "LibStorage::LvmVgInfo"; - import "LibStorage::EvmsCoInfo"; import "LibStorage::PartitionAddInfo"; import "LibStorage::DmPartCoInfo"; import "LibStorage::DmraidCoInfo"; -- 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] r49690 - in /trunk/installation: package/yast2-installation.changes src/clients/switch_scr_finish.ycp src/clients/yast_inf_finish.ycp src/include/scr_switch_debugger.ycp
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 12:30:00 2008 New Revision: 49690 URL: http://svn.opensuse.org/viewcvs/yast?rev=49690&view=rev Log: - Running SCR Switch Debugger unconditionally if switching to installed system fails (bnc #411832). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/switch_scr_finish.ycp trunk/installation/src/clients/yast_inf_finish.ycp trunk/installation/src/include/scr_switch_debugger.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Aug 5 12:30:00 2008 @@ -3,6 +3,8 @@ - Calling reiplauto client in SLES control file before reboot (FATE #304940). +- Running SCR Switch Debugger unconditionally if switching to + installed system fails (bnc #411832). ------------------------------------------------------------------- Mon Aug 04 16:22:55 CEST 2008 - aschnell(a)suse.de Modified: trunk/installation/src/clients/switch_scr_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/switch_… ============================================================================== --- trunk/installation/src/clients/switch_scr_finish.ycp (original) +++ trunk/installation/src/clients/switch_scr_finish.ycp Tue Aug 5 12:30:00 2008 @@ -27,29 +27,13 @@ /** * SCR Switch failed. Reporting error, collecting data. - * bugzilla #201058 + * We don't ask whether to run the debugger, just run it. + * + * bnc #201058, #411832 */ void ErrorDuringSCRSwitch (string chroot_dir) { - // import the library once it is needed - import "Popup"; - - y2error("Cannot switch to SCR '%1'", chroot_dir); - - // Ask users whether they want to debug the problem - if (Popup::YesNoHeadline ( - // popup error headline - _("Installation Error"), - // popup question - _("An error occurred while switching to the installed system -and no recovery is possible. -Run the automatic debugger to find out why it has failed?") - )) { - y2milestone("User decided to debug the current problem"); - - RunSCRSwitchDebugger(chroot_dir); - } else { - y2warning("User decided not to debug the current problem"); - } + y2error("Cannot switch to SCR '%1', running debugger", chroot_dir); + RunSCRSwitchDebugger(chroot_dir); } /* Check arguments */ Modified: trunk/installation/src/clients/yast_inf_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/yast_in… ============================================================================== --- trunk/installation/src/clients/yast_inf_finish.ycp (original) +++ trunk/installation/src/clients/yast_inf_finish.ycp Tue Aug 5 12:30:00 2008 @@ -24,6 +24,10 @@ import "Keyboard"; import "Directory"; import "String"; +/* +import "Arch"; +import "Reipl"; +*/ include "installation/misc.ycp"; @@ -193,19 +197,53 @@ y2milestone ("Printing message about loading kernel via kexec"); SCR::Write (.dev.tty.stderr, _(" -*********************************************************** +************************************************************** Loading installed kernel using kexec. Trying to load installed kernel via kexec instead of rebooting Please, wait. -*********************************************************** +************************************************************** ") ); } } +/* + // FATE #304940: Change YaST2-Module for s390 Disk adaptors from + // hwconfig scheme to udev-scheme + if (Arch::s390 ()) { + boolean different = true; + map <string, any> oldConfiguration = Reipl::ReadState (); + map <string, any> newConfiguration = Reipl::ReadState (); + + if (oldConfiguration != nil) { + y2milestone ("Calling Reipl::ModifyReiplWithBootPartition"); + Reipl::ModifyReiplWithBootPartition (newConfiguration); + + map oldCcwMap = (map)oldConfiguration["ccw"]:nil; + map newCcwMap = (map)newConfiguration["ccw"]:nil; + map oldFcpMap = (map)oldConfiguration["fcp"]:nil; + map newFcpMap = (map)newConfiguration["fcp"]:nil; + + different = oldConfiguration["method"]:"a" != newConfiguration["method"]:"b" + && oldCcwMap["device"]:"a" != newCcwMap["device"]:"b" + && oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b" + && oldFcpMap["device"]:"a" != newFcpMap["device"]:"b" + && oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b" + && oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b" + && oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b" + && oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b"; + } + + y2milestone ("Reipl changed: %1", different); + if (different) { + linuxrc["Root"] = "halt"; + } + } +*/ + linuxrc["Language"] = Language::language; linuxrc["Keytable"] = Keyboard::keymap; Modified: trunk/installation/src/include/scr_switch_debugger.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/scr_swi… ============================================================================== --- trunk/installation/src/include/scr_switch_debugger.ycp (original) +++ trunk/installation/src/include/scr_switch_debugger.ycp Tue Aug 5 12:30:00 2008 @@ -82,18 +82,24 @@ // UI dialog term SCRSwitchDialog () { - return `MarginBox ( - 1, 1, `VBox ( - `MinWidth (70, - // used for progress - `LogView ( - `id (`log_view), - // log-view label - _("&Checking the Installed System..."), - 18, 500 - ) - ), - `ReplacePoint(`id(`dialog_rp), `Empty()) + return `VBox ( + // heading + `Heading (_("Switching to the Installed System Failed")), + // informative text + `Label (_("Running the debugger...")), + `MarginBox ( + 1, 1, `VBox ( + `MinWidth (70, + // used for progress + `LogView ( + `id (`log_view), + // log-view label + _("&Checking the Installed System..."), + 18, 500 + ) + ), + `ReplacePoint(`id(`dialog_rp), `Empty()) + ) ) ); } @@ -109,6 +115,21 @@ UI::ChangeWidget (`id(`log_view), `LastLine, sformat ("%1 %2\n", test_description, (test_result ? result_ok : result_failed)) ); + + UI::ChangeWidget ( + `id(`log_view), `LastLine, + "\n" + + sformat ( + // TRANSLATORS: an error message + // %1 - link to our bugzilla + // %2 - directory where YaST logs are stored + _("This is worth reporting a bug at %1. +Please, attach also all YaST logs stored in the '%2' directory."), + "http://bugzilla.novell.com/", + "/var/log/YaST2/" + ) + + "\n" + ); } // report just some progress -- 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] r49689 - /trunk/mail/src/mail.ycp
by varkoly＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: varkoly Date: Tue Aug 5 12:26:47 2008 New Revision: 49689 URL: http://svn.opensuse.org/viewcvs/yast?rev=49689&view=rev Log: do not evaluate not existent widget Modified: trunk/mail/src/mail.ycp Modified: trunk/mail/src/mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=49689&r1=4… ============================================================================== --- trunk/mail/src/mail.ycp (original) +++ trunk/mail/src/mail.ycp Tue Aug 5 12:26:47 2008 @@ -128,10 +128,13 @@ if (ret == `next ) { - if( (boolean) UI::QueryWidget (`id (`skip_ask), `Value) ) - { - SCR::Write (.sysconfig.mail.SKIP_ASK, "yes"); - } + if( ! first ) + { + if( (boolean) UI::QueryWidget (`id (`skip_ask), `Value) ) + { + SCR::Write (.sysconfig.mail.SKIP_ASK, "yes"); + } + } else { SCR::Write (.sysconfig.mail.SKIP_ASK, "no"); -- 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] r49688 - in /trunk/mail/src: YaPI/MailServer.pm mail-server_helps.ycp
by varkoly＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: varkoly Date: Tue Aug 5 12:15:31 2008 New Revision: 49688 URL: http://svn.opensuse.org/viewcvs/yast?rev=49688&view=rev Log: (bnc#414640) - activating amavisd in mailserver prevention slows the machine Modified: trunk/mail/src/YaPI/MailServer.pm trunk/mail/src/mail-server_helps.ycp Modified: trunk/mail/src/YaPI/MailServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/YaPI/MailServer.pm?rev=… ============================================================================== --- trunk/mail/src/YaPI/MailServer.pm (original) +++ trunk/mail/src/YaPI/MailServer.pm Tue Aug 5 12:15:31 2008 @@ -1348,7 +1348,7 @@ SCR->Execute('.mail.postfix.mastercf.modifyService', { 'service' => 'smtp', 'command' => 'smtpd', - 'maxproc' => '30', + 'maxproc' => '5', 'options' => { 'content_filter' => 'smtp:[127.0.0.1]:10024' } } ); } else @@ -1356,7 +1356,7 @@ SCR->Execute('.mail.postfix.mastercf.addService', { 'service' => 'smtp', 'command' => 'smtpd', - 'maxproc' => '30', + 'maxproc' => '5', 'options' => { 'content_filter' => 'smtp:[127.0.0.1]:10024' } } ); } my $smtps = SCR->Execute('.mail.postfix.mastercf.findService', @@ -2823,7 +2823,7 @@ my $ismax = 0; foreach my $l ( @ACONF ) { - $ismax = 1 if $l =~ s/^\$max_servers = \d+/\$max_servers = 30/; + $ismax = 1 if $l =~ s/^\$max_servers = \d+/\$max_servers = 5/; $l =~ s/(.*)/# $1/ if $l =~ /bypass_virus_checks_acl.*=.*qw\( \./; if( $isclam || $l =~ /Clam Antivirus-clamd/ ) { @@ -2839,7 +2839,7 @@ } if( !$ismax ) { - push @CONF, '$max_servers = 30;' + push @CONF, '$max_servers = 5;' } if( ! open(OUT,">$aconf.new") ) { Modified: trunk/mail/src/mail-server_helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_helps.ycp?r… ============================================================================== --- trunk/mail/src/mail-server_helps.ycp (original) +++ trunk/mail/src/mail-server_helps.ycp Tue Aug 5 12:15:31 2008 @@ -89,7 +89,7 @@ The virus scanner engine Clamavd and the spam finder SpamAssassin will be installed and configured too. You can install other (comerciel) virus scanner engine. -"), + +") + /* MailPrevention dialog help 3/3 */ _("<big>Configure Spam Learning Extension:</big> The spam learning extension can only configured if the local delivery method cyrus imapd is. -- 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] r49687 - in /trunk/storage: VERSION libstorage/src/StorageInterface.h package/yast2-storage.changes storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 12:13:25 2008 New Revision: 49687 URL: http://svn.opensuse.org/viewcvs/yast?rev=49687&view=rev Log: - removed EVMS functions from StorageInterface.h Modified: trunk/storage/VERSION trunk/storage/libstorage/src/StorageInterface.h trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=49687&r1=496… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Tue Aug 5 12:13:25 2008 @@ -1 +1 @@ -2.17.10 +2.17.11 Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Tue Aug 5 12:13:25 2008 @@ -773,26 +773,6 @@ LvmVgInfo& info) = 0; /** - * Query container info for a EVMS container - * - * @param name name of container, e.g. lvm2/system - * @param info record that gets filled with EVMS Container special data - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int getEvmsCoInfo( const string& name, EvmsCoInfo& info) = 0; - - /** - * Query container info for a EVMS container - * - * @param name name of container, e.g. lvm2/system - * @param cinfo record that gets filled with container general data - * @param info record that gets filled with EVMS Container special data - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int getContEvmsCoInfo( const string& name, ContainerInfo& cinfo, - EvmsCoInfo& info) = 0; - - /** * Query container info for a DMRAID container * * @param name name of container, e.g. pdc_ccaihgii @@ -849,16 +829,6 @@ deque<LvmLvInfo>& plist ) = 0; /** - * Query infos for EVMS volumes of a EVMS container - * - * @param name name of volume group, e.g. lvm2/system - * @param plist list of records that get filled with EVMS specific info - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int getEvmsInfo( const string& name, - deque<EvmsInfo>& plist ) = 0; - - /** * Query infos for software raid devices in system * * @param plist list of records that get filled with MD specific info @@ -1592,137 +1562,6 @@ unsigned long long stripeSize ) = 0; /** - * Create a EVMS container - * - * @param name name of container, must not contain blanks, colons - * and shell special characters (e.g. system) - * @param peSizeK physical extent size in kilobytes - * @param lvm1 flag if lvm1 compatible format should be used - * @param devs list with physical devices to add to that volume group - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int createEvmsContainer( const string& name, - unsigned long long peSizeK, bool lvm1, - const deque<string>& devs ) = 0; - - /** - * Modify a EVMS container. - * This function can only be used between the creation of a - * EVMS container and the next call to commit(). Containers that - * are already written to disk cannot have these properties changed. - * - * @param old_name name of container, must not contain blanks, colons - * and shell special characters (e.g. system) - * @param new_name new name of container, same restrictions as for - * first parameter - * @param peSizeK physical extent size in kilobytes - * @param lvm1 flag if lvm1 compatible format should be used - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int modifyEvmsContainer( const string& old_name, - const string& new_name, - unsigned long long peSizeK, - bool lvm1 ) = 0; - - /** - * Remove a EVMS container. If the container contains - * logical volumes, these are automatically also removed. - * - * @param name name of container - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int removeEvmsContainer( const string& name ) = 0; - - /** - * Extend a EVMS container with additional physical devices - * - * @param name name of container - * @param devs list with physical devices to add to that container - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int extendEvmsContainer( const string& name, - const deque<string>& devs ) = 0; - - /** - * Shrink a EVMS container - * - * @param name name of container - * @param devs list with physical devices to remove from that container - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int shrinkEvmsContainer( const string& name, - const deque<string>& devs ) = 0; - - /** - * Create a EVMS volume within a EVMS container - * - * @param coname of container - * @param name of volume - * @param size size of volume in megabytes - * @param stripe stripe count of volume (use 1 unless you know - * exactly what you are doing) - * @param device is set to the device name of the new volume - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int createEvmsVolume( const string& coname, const string& name, - unsigned long long sizeM, unsigned stripe, - string& device ) = 0; - - /** - * Remove a EVMS volume - * - * @param device name of EVMS volume - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int removeEvmsVolumeByDevice( const string& device ) = 0; - - /** - * Remove a EVMS volume from a EVMS container - * - * @param coname name of container - * @param name name of volume - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int removeEvmsVolume( const string& coname, const string& name ) = 0; - - /** - * Change strip count of a EVMS volume. - * This can only be before the volume is created on disk. - * - * @param coname name of EVMS container - * @param name of volume - * @param stripe new stripe count of volume - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int changeEvmsStripeCount( const string& coname, - const string& name, - unsigned long stripe ) = 0; - - /** - * Change strip size of a EVMS volume. - * This can only be before the volume is created on disk. - * - * @param coname name of EVMS container - * @param name of volume - * @param stripeSize new stripe size of volume - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int changeEvmsStripeSize( const string& coname, - const string& name, - unsigned long long stripeSize ) = 0; - - /** - * Activate EVMS devices on the system. - * This is only necessary on systems where EVMS is not activated - * during system startup. This command is executed immediately, - * there is no need for a call to commit(). - * - * @param force flag if activation should be forced - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int evmsActivate( bool force ) = 0; - - /** * Determine the device name of the next created software raid device * * @param nr is set to the number of the next created software raid device @@ -2184,23 +2023,7 @@ virtual bool readFstab( const string& dir, deque<VolumeInfo>& infos) = 0; /** - * Possibility to switch Evms handling off or on in libstorage. - * This function must be called prior to libstorage initialisation. - * Default is on. - * - * @param val determines if Evms is switched off or on - */ - virtual void setNoEvms( bool val ) = 0; - - /** - * Returns the state of Evms handling in libstorage. - * - * @param val determines if Evms is switched off or on - */ - virtual bool getNoEvms() = 0; - - /** - * Activate or deactivate higher level devices as MD,LVM,DM,EVMS + * Activate or deactivate higher level devices as MD, LVM, DM * * @param val flag if devices should be activated or deactivated * @return bool if values could be successfully determined @@ -2210,7 +2033,7 @@ /** * Rescan all disks. * All currently detected objects are forgotten and a new scan - * for all type of objects (disks, LVM, EVMS, MD) is initiated. + * for all type of objects (disks, LVM, MD) is initiated. * This function makes sense to be called after something outside * of libstorage changed disk layout or created storage objects. * Any changes already cached are lost. Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Aug 5 12:13:25 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 05 12:07:10 CEST 2008 - aschnell(a)suse.de + +- removed EVMS functions from StorageInterface.h +- version 2.17.11 + +------------------------------------------------------------------- Mon Aug 04 15:00:26 CEST 2008 - aschnell(a)suse.de - changed default mount-by to path on s390 (fate #303557) Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Aug 5 12:13:25 2008 @@ -3010,12 +3010,7 @@ global boolean DeleteEvmsCo( string name ) { - y2milestone( "DeleteEvmsCo name:%1", name ); - integer ret = LibStorage::StorageInterface::removeEvmsContainer( sint, name ); - if( ret<0 ) - y2error( "DeleteEvmsCo sint ret:%1", ret ); - UpdateTargetMap(); - return( ret==0 ); + return false; } global string EvmsShortName( string lname ) @@ -3028,13 +3023,7 @@ global boolean ActivateEvms() { - integer ret = 0; - y2milestone( "Mode:%1", Mode::mode() ); - ret = LibStorage::StorageInterface::evmsActivate( sint, Mode::update() ); - if( ret<0 ) - y2error( "activateEvms sint ret:%1", ret ); - UpdateTargetMap(); - return( ret==0 ); + return false; } global list EvmsTrivialMaps( map tgMap ) @@ -3049,116 +3038,41 @@ global boolean CreateEvmsCo( string name, integer pesize, boolean lvm2 ) { - y2milestone( "CreateEvmsCo name:%1 pesize:%2 lvm2:%3", name, pesize, lvm2 ); - string sname = EvmsShortName( name ); - y2milestone( "CreateEvmsCo sname:%1", sname ); - list<string> devs = []; - integer ret = 0; - ret = LibStorage::StorageInterface::createEvmsContainer( sint, sname, - pesize/1024, - !lvm2, devs ); - if( ret<0 ) - y2error( "CreateEvmsCo sint ret:%1", ret ); - UpdateTargetMap(); - return( ret==0 ); + return false; } global boolean ModifyEvmsCo( string old_name, string new_name, integer pesize, boolean lvm2 ) { - y2milestone( "ModifyEvmsCo old name:%1 new name:%2 pesize:%3 lvm2:%4", - old_name, new_name, pesize, lvm2 ); - string sname = EvmsShortName( old_name ); - y2milestone( "CreateEvmsCo sname:%1", sname ); - list<string> devs = []; - integer ret = 0; - ret = LibStorage::StorageInterface::modifyEvmsContainer( sint, sname, - new_name, - pesize/1024, - !lvm2 ); - if( ret<0 ) - y2error( "ModifyEvmsCo sint ret:%1", ret ); - UpdateTargetMap(); - return( ret==0 ); + return false; } global boolean ExtendEvmsCo( string name, string device ) { - y2milestone( "ExtendEvmsCo name:%1 device:%2", name, device ); - integer ret = 0; - string sname = EvmsShortName( name ); - y2milestone( "ExtendEvmsCo sname:%1", sname ); - list<string> devs = [ device ]; - ret = LibStorage::StorageInterface::extendEvmsContainer( sint, sname, - devs ); - if( ret<0 ) - y2error( "ExtendEvmsCo sint ret:%1", ret ); - UpdateTargetMap(); - return( ret==0 ); + return false; } global boolean ReduceEvmsCo( string name, string device ) { - y2milestone( "ReduceEvmsCo name:%1 device:%2", name, device ); - integer ret = 0; - string sname = EvmsShortName( name ); - y2milestone( "ReduceEvmsCo sname:%1", sname ); - list<string> devs = [ device ]; - ret = LibStorage::StorageInterface::shrinkEvmsContainer( sint, sname, - devs ); - if( ret<0 ) - y2error( "ReduceEvmsCo sint ret:%1", ret ); - UpdateTargetMap(); - return( ret==0 ); + return false; } global boolean CreateEvmsVolume( string coname, string lvname, integer sizeK, integer stripe ) { - y2milestone( "CreateEvmsVolume vg:%1 name:%2 sizeK:%3 stripe:%4", coname, - lvname, sizeK, stripe ); - integer ret = 0; - string dummy = ""; - string sname = EvmsShortName( coname ); - y2milestone( "CreateEvmsVolume sname:%1", sname ); - ret = LibStorage::StorageInterface::createEvmsVolume( sint, sname, lvname, - (sizeK+1023)/1024, - stripe, dummy ); - if( ret<0 ) - y2error( "CreateEvmsVolume sint ret:%1", ret ); - UpdateTargetMapDisk( "/dev/evms/"+coname ); - return( ret==0 ); + return false; } global boolean ChangeEvmsStripeCount( string coname, string name, integer stripe ) { - y2milestone( "ChangeEvmsStripeCount co:%1 name:%2 stripe:%3", coname, - name, stripe ); - integer ret = 0; - string dummy = ""; - ret = LibStorage::StorageInterface::changeEvmsStripeCount( sint, coname, - name, stripe ); - if( ret<0 ) - y2error( "ChangeEvmsStripeCount sint ret:%1", ret ); - UpdateTargetMapDisk( "/dev/evms/"+coname ); - return( ret==0 ); + return false; } global boolean ChangeEvmsStripeSize( string coname, string name, integer stripeSize ) { - y2milestone( "ChangeEvmsStripeSize co:%1 name:%2 stripeSize:%3", coname, - name, stripeSize ); - integer ret = 0; - string dummy = ""; - ret = LibStorage::StorageInterface::changeEvmsStripeSize( sint, coname, - name, - stripeSize ); - if( ret<0 ) - y2error( "ChangeEvmsStripeSize sint ret:%1", ret ); - UpdateTargetMapDisk( "/dev/evms/"+coname ); - return( ret==0 ); + return false; } global boolean AddNfsVolume( string nfsdev, string opts, integer sz, string mp ) -- 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] r49686 - in /trunk/bootloader/src: generic/Makefile.am generic/device_map_edit_widget.ycp grub/helps.ycp modules/BootCommon.ycp modules/BootGRUB.ycp routines/helps_i386.ycp
by juhliarik＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: juhliarik Date: Tue Aug 5 12:04:46 2008 New Revision: 49686 URL: http://svn.opensuse.org/viewcvs/yast?rev=49686&view=rev Log: added/enabled support for manual ordering of disks in device.map fro GRUB fate #303964 M bootloader/src/modules/BootCommon.ycp * deleted using of Storage::UseLilo() M bootloader/src/modules/BootGRUB.ycp * enable ordering of disk M bootloader/src/routines/helps_i386.ycp * added new/old help text M bootloader/src/generic/Makefile.am A bootloader/src/generic/device_map_edit_widget.ycp * created clone of dialog_i386.ycp * there is dialog for ordering disks in device.map Added: trunk/bootloader/src/generic/device_map_edit_widget.ycp Modified: trunk/bootloader/src/generic/Makefile.am trunk/bootloader/src/grub/helps.ycp trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/routines/helps_i386.ycp Modified: trunk/bootloader/src/generic/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/generic/Makefile.… ============================================================================== --- trunk/bootloader/src/generic/Makefile.am (original) +++ trunk/bootloader/src/generic/Makefile.am Tue Aug 5 12:04:46 2008 @@ -14,7 +14,8 @@ section_widgets.ycp \ sections_widget.ycp \ widget_funcs.ycp \ - wizards.ycp + wizards.ycp \ + device_map_edit_widget.ycp EXTRA_DIST = \ $(ynclude_DATA) Added: trunk/bootloader/src/generic/device_map_edit_widget.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/generic/device_ma… ============================================================================== --- trunk/bootloader/src/generic/device_map_edit_widget.ycp (added) +++ trunk/bootloader/src/generic/device_map_edit_widget.ycp Tue Aug 5 12:04:46 2008 @@ -0,0 +1,184 @@ +/** + * File: + * include/bootloader/routines/dialogs.ycp + * + * Module: + * Bootloader installation and configuration + * + * Summary: + * Dialogs for configuraion i386-specific functions + * + * Authors: + * Jiri Srain <jsrain(a)suse.cz> + * + * $Id: dialogs_i386.ycp 47885 2008-05-26 16:34:24Z juhliarik $ + * + */ + + +{ +textdomain "bootloader"; + + +import "Label"; +import "Wizard"; +import "CWM"; +import "BootCommon"; +import "Stage"; + +include "bootloader/routines/helps_i386.ycp"; + + +/** + * Run dialog to adjust installation on i386 and AMD64 + * @return symbol for wizard sequencer + */ +symbol i386InstallDetailsDialog () { + term contents = `HBox (`HStretch (), `VBox ( + `VStretch (), + // frame + `Frame (_("Disk Order"), + `HBox (`HSpacing (2), `VBox ( + `VSpacing (1), + `SelectionBox (`id (`disks), + `opt (`notify, `immediate), + // selectionn box label + _("D&isks"), []), + Mode::config () + ? `HBox ( + `HStretch (), + `PushButton (`id (`add), `opt (`key_F3), Label::AddButton ()), + `PushButton (`id (`delete), `opt(`key_F5), Label::DeleteButton ()), + `HStretch () + ) + : `HBox (), + `VSpacing (1) + ), + `HSquash ( + `VBox ( + `VStretch (), + `PushButton (`id (`up), `opt (`hstretch), _("&Up")), + `PushButton (`id (`down), `opt (`hstretch), _("&Down")), + `VStretch () + ) + ), + `HSpacing (2) + ) + ), + `VStretch () + + ), `HStretch ()); + + Wizard::SetContentsButtons ( + // dialog caption + _("Boot Loader Device Map"), + contents, + i386DeviceMapEditHelp(), + Label::BackButton (), + Label::OKButton ()); + + list<string> disks_order = BootCommon::DisksOrder (); + + UI::ChangeWidget (`id (`disks), `Items, disks_order); + UI::ChangeWidget (`id (`disks), `CurrentItem, disks_order[0]:""); + + any ret = nil; + while (ret == nil) + { + string current = (string)UI::QueryWidget (`id (`disks), `CurrentItem); + integer pos = 0; + while (pos < size (disks_order) && disks_order[pos]:"" != current) + pos = pos + 1; + UI::ChangeWidget (`id (`up), `Enabled, + pos > 0 && pos < size (disks_order)); + UI::ChangeWidget (`id (`down), `Enabled, pos < size (disks_order) - 1); + + ret = UI::UserInput (); + boolean order_changed = false; + + if (ret == `add) + { + term popup = `VBox (`VSpacing (1), + // textentry header + `InputField (`id (`devname), `opt (`hstretch), _("&Device")), + `VSpacing (1), + `HBox (`HStretch (), + `PushButton (`id (`ok), `opt (`key_F10, `default), + Label::OKButton ()), + `HStretch (), + `PushButton (`id (`cancel), `opt (`key_F8), + Label::CancelButton ()), + `HStretch () + ), + `VSpacing (1) + ); + UI::OpenDialog (popup); + symbol pushed = (symbol)UI::UserInput (); + string new_dev = (string) + UI::QueryWidget (`id (`devname), `Value); + UI::CloseDialog (); + if (pushed == `ok) + { + disks_order = add (disks_order, new_dev); + order_changed = true; + current = new_dev; + } + } + else if (ret == `delete) + { + disks_order = filter (string d, disks_order, { + return d != current; + }); + order_changed = true; + current = disks_order[0]:nil; + } + else if (ret == `up) + { + disks_order = (list<string>) + BootCommon::swapItems (disks_order, pos, pos - 1); + order_changed = true; + } + else if (ret == `down) + { + disks_order = (list<string>) + BootCommon::swapItems (disks_order, pos, pos + 1); + order_changed = true; + } + + if (ret == `cancel) + ret = `abort; + if (ret != `next && ret != `abort && ret != `back) + { + if (order_changed) + { + UI::ChangeWidget (`id (`disks), `Items, disks_order); + UI::ChangeWidget (`id (`disks), `CurrentItem, current); + } + ret = nil; + } + } + if (ret == `next) + { + integer index = 0; + BootCommon::device_mapping = filter (string k, string v, + BootCommon::device_mapping, + { + return substring (v, 0, 2) != "hd"; + }); + BootCommon::mbrDisk = disks_order[0]:""; + BootCommon::device_mapping = (map<string,string>)union ( + BootCommon::device_mapping, + listmap (string d, disks_order, { + string hex_index = substring (tohexstring (index), 2); + index = index + 1; + return $[ d : sformat ("hd%1", hex_index) ]; + }) + ); + + } + return (symbol)ret; +} + + + +} // EOF Modified: trunk/bootloader/src/grub/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/helps.ycp?re… ============================================================================== --- trunk/bootloader/src/grub/helps.ycp (original) +++ trunk/bootloader/src/grub/helps.ycp Tue Aug 5 12:04:46 2008 @@ -126,7 +126,7 @@ global map<string,string> grub_descriptions = $[ - "boot" : _("Boot Loader Locations"), + "boot" : _("Boot Loader Locations"), "activate" : _("Set active Flag in Partition Table for Boot Partition"), "timeout" : _("Timeout in Seconds"), "default" : _("Default Boot Section"), Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommo… ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Tue Aug 5 12:04:46 2008 @@ -1025,15 +1025,11 @@ y2milestone ("It is XEN domU and the bootloader should be installed"); } - if (loader_type == "grub" && Storage::UseLilo()) + if (loader_type == "grub") { - loader_type = "lilo"; prefer_lilo = true; } - else - { - prefer_lilo = false; - } + loader_type = SupportedLoader (loader_type); y2milestone ("Detected bootloader %1", loader_type); Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Tue Aug 5 12:04:46 2008 @@ -61,6 +61,7 @@ include "bootloader/grub/misc.ycp"; include "bootloader/routines/popups.ycp"; include "bootloader/grub/helps.ycp"; +include "bootloader/generic/device_map_edit_widget.ycp"; include "bootloader/generic/dialogs.ycp"; @@ -759,6 +760,7 @@ global map<string,symbol()> Dialogs () { return $[ + "installation" : i386InstallDetailsDialog, "loader" : genericBootLoaderOptionsDialog, ]; } Modified: trunk/bootloader/src/routines/helps_i386.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/helps_i3… ============================================================================== --- trunk/bootloader/src/routines/helps_i386.ycp (original) +++ trunk/bootloader/src/routines/helps_i386.ycp Tue Aug 5 12:04:46 2008 @@ -56,6 +56,20 @@ : ""); } +string i386DeviceMapEditHelp () +{ + // help text 1/5 + return _("<big>Disks Order</big> +To specify the order of the disks according to the order in BIOS, use +the Up and Down buttons to reorder the disks.") + + (Mode::config () + // help text 2/5, optional (only for autoinstallation) + ? _("To add a disk, push Add. + To remove a disk, push Remove.") + : ""); +} + + /** * Get help * @return string help text -- 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] r49685 - in /trunk/installation: control/control.SLES.xml package/yast2-installation.changes
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 11:50:25 2008 New Revision: 49685 URL: http://svn.opensuse.org/viewcvs/yast?rev=49685&view=rev Log: - Calling reiplauto client in SLES control file before reboot (FATE #304940). Modified: trunk/installation/control/control.SLES.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Tue Aug 5 11:50:25 2008 @@ -490,6 +490,12 @@ <label>Perform Installation</label> <name>rpmcopy</name> </module> +  + <module> + <label>Perform Installation</label> + <name>reiplauto</name> + <archs>s390</archs> + </module> <module> <label>Perform Installation</label> <name>finish</name> @@ -582,6 +588,12 @@ <label>Perform Update</label> <name>rpmcopy</name> </module> + <module> +  + <label>Perform Update</label> + <name>reiplauto</name> + <archs>s390</archs> + </module> <module> <label>Perform Update</label> <name>finish</name> @@ -967,6 +979,12 @@ <label>Perform Installation</label> <name>rpmcopy</name> </module> +  + <module> + <label>Perform Installation</label> + <name>reiplauto</name> + <archs>s390</archs> + </module> <module> <label>Perform Installation</label> <name>finish</name> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Aug 5 11:50:25 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 5 11:48:44 CEST 2008 - locilka(a)suse.cz + +- Calling reiplauto client in SLES control file before reboot + (FATE #304940). + +------------------------------------------------------------------- Mon Aug 04 16:22:55 CEST 2008 - aschnell(a)suse.de - improved text during ssh installation (bnc #411079) -- 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] r49684 - /trunk/storage/storage/src/include/raid_lib.ycp
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 11:30:34 2008 New Revision: 49684 URL: http://svn.opensuse.org/viewcvs/yast?rev=49684&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/include/raid_lib.ycp Modified: trunk/storage/storage/src/include/raid_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/raid… ============================================================================== --- trunk/storage/storage/src/include/raid_lib.ycp (original) +++ trunk/storage/storage/src/include/raid_lib.ycp Tue Aug 5 11:30:34 2008 @@ -223,53 +223,6 @@ return( false ); }; - - -/** - * partition list to widget table - * in: - * [ $["fsid":142, - * "fstype":"Linux raid", - * "nr":"var", - * "region":[255, 16], - * "type":`primary], - * $[ - * "fsid":131, - * "fstype":"Linux native", - * "nr":4, "region":[271, 844], - * ... - * - * out: - * [ - * `item(`id("/dev/hda1"), "/dev/hda1 ", " 2G ", " LVM ", "md1"), - * `item(`id("/dev/hda2"), "/dev/hda2 ", " 1G ", " Linux ", " ") - * ]; - **/ -define list get_raid_widget_table( list<map> possRdList ) - ``{ - possRdList = - sort( map x, map y, possRdList, - ``{ - if( x["maindev"]:"" == y["maindev"]:"" ) - { - return( x["nr"]:0 < y["nr"]:0 ); - } - else - { - return( x["maindev"]:"" < y["maindev"]:""); - } - }); - - return( maplist( map p, possRdList, - ``{ - return(`item( `id(p["device"]:"--"), p["device"]:"--", - ByteToHumanStringWithZero(p["size_k"]:0*1024), - p["fstype"]:"--", - p["used_by"]:"--" - )); - })); - }; - /** * number for /dev/mdX, 0 for /dev/md0, 1 for /dev/md1 -- 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] r49683 - in /trunk/storage/storage/src/include: partition_defines.ycp raid_lib.ycp
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 11:28:37 2008 New Revision: 49683 URL: http://svn.opensuse.org/viewcvs/yast?rev=49683&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/include/partition_defines.ycp trunk/storage/storage/src/include/raid_lib.ycp Modified: trunk/storage/storage/src/include/partition_defines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/part… ============================================================================== --- trunk/storage/storage/src/include/partition_defines.ycp (original) +++ trunk/storage/storage/src/include/partition_defines.ycp Tue Aug 5 11:28:37 2008 @@ -191,14 +191,6 @@ }; - /*--------------------------------------------------------------------- - * changeExtendedIdTo15 - *--------------------------------------------------------------------- - * change the fsid of every extended partiton in the map targets - * in user_settings from 5 to 15 - *--------------------------------------------------------------------- - */ - //////////////////////////////////////////////////////////////////////// // input: // win_size_f: new size of wimdows partion in bytes as float Modified: trunk/storage/storage/src/include/raid_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/raid… ============================================================================== --- trunk/storage/storage/src/include/raid_lib.ycp (original) +++ trunk/storage/storage/src/include/raid_lib.ycp Tue Aug 5 11:28:37 2008 @@ -143,30 +143,6 @@ }; - - -/* - * @param targetMap - * @param partition the raid for which the size is calculated - * out: size of RAID as string - */ -define string raid_size_str( map partition ) - ``{ - return( ByteToHumanStringWithZero( partition["size_k"]:0*1024 )); - }; - - -/* - * in: targetMap: the targetMap ;-) - * in: partition: the raid for which the size is calculated - * out: size of RAID in byte - */ -define integer raid_size_byte( map partition ) - ``{ - return( partition["size_k"]:0*1024 ); - }; - - /* * get the number of devices which belong to the raid */ -- 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] r49682 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes
by tgoettlicher＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: tgoettlicher Date: Tue Aug 5 11:26:20 2008 New Revision: 49682 URL: http://svn.opensuse.org/viewcvs/yast?rev=49682&view=rev Log: 2.17.5 Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=49682&r1=49… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Tue Aug 5 11:26:20 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "17") -SET(VERSION_PATCH "4") +SET(VERSION_PATCH "5") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Tue Aug 5 11:26:20 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Aug 5 11:14:01 CEST 2008 - tgoettlicher(a)suse.de + +- V 2.18.5 + +------------------------------------------------------------------- Tue Aug 5 10:54:04 CEST 2008 - tgoettlicher(a)suse.de - Fixed bnc #409612: popup menu during installation becomes -- 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] r49681 - in /trunk/storage/storage/src: include/custom_part_check_generated.ycp include/partition_defines.ycp modules/Storage.ycp
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 11:22:23 2008 New Revision: 49681 URL: http://svn.opensuse.org/viewcvs/yast?rev=49681&view=rev Log: - removed obsolete code (mostly evms related) Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp trunk/storage/storage/src/include/partition_defines.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Tue Aug 5 11:22:23 2008 @@ -707,29 +707,6 @@ if (ret == true) retval = `again; } - if( !Storage::CheckEvmsLvm() ) - { - if( Popup::YesNo( evms_texts_evms_lvm() )) - { - Storage::DoCheckEvmsLvm = false; - } - else - { - retval = `again; - } - } - if( !Storage::CheckEvmsNonEvms() ) - { - if( Popup::YesNo( evms_texts_evms_nonevms() )) - { - Storage::DoCheckEvmsNonEvms = false; - } - else - { - retval = `again; - } - } - return( [targetMap, retval] ); }; Modified: trunk/storage/storage/src/include/partition_defines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/part… ============================================================================== --- trunk/storage/storage/src/include/partition_defines.ycp (original) +++ trunk/storage/storage/src/include/partition_defines.ycp Tue Aug 5 11:22:23 2008 @@ -28,27 +28,10 @@ import "Report"; import "String"; import "Popup"; -// include "partitioning/custom_part_testdata.ycp"; - textdomain "storage"; - - ////////////////////////////////////////////////////////////////////// - // fills up a string to a minimum length - - define string ToLen( integer wide, string str ) - ``{ - while ( size(str) < wide ) str = " " + str; - return( str ); - }; - ////////////////////////////////////////////////////////////////////// - // converts int to string - // fills up the string to a minimum length + textdomain "storage"; - define string ToStringLen( integer wide, integer number ) - ``{ - return( ToLen( wide, sformat("%1", number ))); - }; ////////////////////////////////////////////////////////////////////// // size str to byte @@ -270,31 +253,5 @@ return( Mode::normal()?"":(free_list[0]:"") ); }; -define string evms_texts_evms_nonevms() - ``{ - string t = -_("It is normally not a good idea to use EVMS and non-EVMS -entities on the same disk. -While it is possible in principle and may make sense -for experienced users, it also can easily create -unexpected problems. - -Really do this? -"); - return( t ); - } -define string evms_texts_evms_lvm() - { - string t = -_("It is normally not a good idea to use EVMS and LVM -on the same system. -While it is possible in principle and may make sense -for experienced users, it also can easily create -unexpected problems. - -Really do this? -"); - return( t ); - } } Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Aug 5 11:22:23 2008 @@ -157,8 +157,6 @@ "right_asymmetric" : LibStorage::RIGHT_ASYMMETRIC(), "right_symmetric" : LibStorage::RIGHT_SYMMETRIC() ]; -global boolean DoCheckEvmsNonEvms = true; -global boolean DoCheckEvmsLvm = true; map DiskMapVersion = $[]; map DiskMap = $[]; map ClassifiedSettings = $[]; @@ -6187,35 +6185,6 @@ return( disks ); }; -global define boolean CheckEvmsNonEvms() - ``{ - boolean ret = true; - if( DoCheckEvmsNonEvms ) - { - map<string,map> tg = GetTargetMap(); - list<string> evms = GetUsedEvmsDisks( tg ); - list<string> nonevms = GetUsedRealDisksNew( tg, true ); - evms = filter( string d, evms, ``(contains( nonevms, d ))); - y2milestone( "CheckEvmsNonEvms intersec %1", evms ); - ret = size(evms)==0; - } - y2milestone( "CheckEvmsNonEvms ret %1", ret ); - return( ret ); - }; - -global define boolean CheckEvmsLvm() - ``{ - boolean ret = true; - if( DoCheckEvmsLvm ) - { - map<string,map> tg = GetTargetMap(); - list evms = GetUsedEvmsDisks( tg ); - list lvms = GetUsedLvmGroups( tg ); - ret = size(evms)==0 || size(lvms)==0; - } - y2milestone( "CheckEvmsLvm ret %1", ret ); - return( ret ); - }; global list<map> GetPrepBoot( map<string,map> tg ) { -- 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] r49680 - /trunk/storage/storage/src/modules/Makefile.am
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 11:11:19 2008 New Revision: 49680 URL: http://svn.opensuse.org/viewcvs/yast?rev=49680&view=rev Log: - removed generating of include dir (modules do not include anything since that would be sick) Modified: trunk/storage/storage/src/modules/Makefile.am Modified: trunk/storage/storage/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Make… ============================================================================== --- trunk/storage/storage/src/modules/Makefile.am (original) +++ trunk/storage/storage/src/modules/Makefile.am Tue Aug 5 11:11:19 2008 @@ -1,33 +1,28 @@ # -# Files being accessed using "import" should be installed to +# Makefile.am for storage/src/modules # -YCPCFLAGS = -I . -I include -M ../../../libstorage/bindings/ycp +YCPCFLAGS = -M ../../../libstorage/bindings/ycp YCPC_LD_LIBRARY_PATH = ../../../libstorage/src/.libs YCPC_Y2DIR = ../../../libstorage/src/.libs module_DATA = \ - Partitions.ycp \ - FileSystems.ycp \ - Storage.ycp \ - StorageClients.ycp \ - StorageControllers.ycp \ - StorageDevices.ycp \ - StorageFields.ycp \ - StorageSettings.ycp \ - TreePanel.ycp \ - TabPanel.ycp \ - MiniWorkflow.ycp \ - Greasemonkey.ycp \ - DevicesSelectionBox.ycp \ - DualMultiSelectionBox.ycp + Partitions.ycp \ + FileSystems.ycp \ + Storage.ycp \ + StorageClients.ycp \ + StorageControllers.ycp \ + StorageDevices.ycp \ + StorageFields.ycp \ + StorageSettings.ycp \ + TreePanel.ycp \ + TabPanel.ycp \ + MiniWorkflow.ycp \ + Greasemonkey.ycp \ + DevicesSelectionBox.ycp \ + DualMultiSelectionBox.ycp EXTRA_DIST = $(module_DATA) -include: - mkdir include && ln -sf ../../include include/partitioning - -ycpchook = include - include $(top_srcdir)/Makefile.am.common -- 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] r49679 - in /trunk/qt: package/yast2-qt.changes src/YQApplication.cc src/YQDialog.cc src/YQUI_builtins.cc
by tgoettlicher＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: tgoettlicher Date: Tue Aug 5 11:08:13 2008 New Revision: 49679 URL: http://svn.opensuse.org/viewcvs/yast?rev=49679&view=rev Log: Fixed bnc #409612: popup menu during installation becomes hidden because of NULL parent Modified: trunk/qt/package/yast2-qt.changes trunk/qt/src/YQApplication.cc trunk/qt/src/YQDialog.cc trunk/qt/src/YQUI_builtins.cc Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Tue Aug 5 11:08:13 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 5 10:54:04 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed bnc #409612: popup menu during installation becomes + hidden because of NULL parent + +------------------------------------------------------------------- Tue Jul 29 11:21:53 CEST 2008 - tgoettlicher(a)suse.de - Fixed sorting in Table (bnc #399206) Modified: trunk/qt/src/YQApplication.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQApplication.cc?rev=4967… ============================================================================== --- trunk/qt/src/YQApplication.cc (original) +++ trunk/qt/src/YQApplication.cc Tue Aug 5 11:08:13 2008 @@ -483,12 +483,18 @@ QString fileName; bool tryAgain = false; + QWidget* parent = 0; + YDialog * currentDialog = YDialog::currentDialog( false ); + if (currentDialog) + parent = (QWidget *) currentDialog->widgetRep(); + + do { // Leave the mouse cursor alone - this function might be called from // some other widget, not only from UI::AskForSaveFileName(). - fileName = QFileDialog::getSaveFileName( 0, // parent + fileName = QFileDialog::getSaveFileName( parent, // parent headline, // caption startWith, // dir filter ); // filter @@ -512,7 +518,7 @@ msg = ( _( "%1 exists and is write-protected!\nReally overwrite?" ) ).arg( fileName ); } - int buttonNo = QMessageBox::information( 0, // parent widget + int buttonNo = QMessageBox::information( parent, // Translators: Window title for confirmation dialog _( "Confirm" ), msg, @@ -588,7 +594,13 @@ "\n" "Switch left and right mouse buttons?" ); - int button = QMessageBox::question( 0, + + QWidget* parent = 0; + YDialog * currentDialog = YDialog::currentDialog( false ); + if (currentDialog) + parent = (QWidget *) currentDialog->widgetRep(); + + int button = QMessageBox::question( parent, // Popup dialog caption _( "Unexpected Click" ), message, Modified: trunk/qt/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQDialog.cc?rev=49679&r1=… ============================================================================== --- trunk/qt/src/YQDialog.cc (original) +++ trunk/qt/src/YQDialog.cc Tue Aug 5 11:08:13 2008 @@ -576,8 +576,13 @@ if ( YQUI::ui()->usingVisionImpairedPalette() ) { + QWidget* parent = 0; + YDialog * currentDialog = YDialog::currentDialog( false ); + if (currentDialog) + parent = (QWidget *) currentDialog->widgetRep(); + yuiMilestone() << "Switched to vision impaired palette" << endl; - QMessageBox::information( 0, // parent + QMessageBox::information( parent, // parent _("Color switching"), // caption _( "Switching to color palette for vision impaired users -\n" "press Shift-F4 again to switch back to normal colors." ), // text Modified: trunk/qt/src/YQUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI_builtins.cc?rev=4967… ============================================================================== --- trunk/qt/src/YQUI_builtins.cc (original) +++ trunk/qt/src/YQUI_builtins.cc Tue Aug 5 11:08:13 2008 @@ -182,7 +182,12 @@ if ( interactive ) { - QMessageBox::warning( 0, // parent + QWidget* parent = 0; + YDialog * currentDialog = YDialog::currentDialog( false ); + if (currentDialog) + parent = (QWidget *) currentDialog->widgetRep(); + + QMessageBox::warning( parent, // parent "Error", // caption QString( "Couldn't save screen shot\nto %1" ).arg( fileName ), QMessageBox::Ok | QMessageBox::Default, // button0 @@ -199,6 +204,12 @@ QString( "*.tgz *.tar.gz" ), // filter QString( "Save y2logs to..." ) ); // headline + QWidget* parent = 0; + YDialog * currentDialog = YDialog::currentDialog( false ); + if (currentDialog) + parent = (QWidget *) currentDialog->widgetRep(); + + if ( ! fileName.isEmpty() ) { QString saveLogsCommand = "/sbin/save_y2logs"; @@ -215,7 +226,7 @@ << "\" exited with " << result << endl; - QMessageBox::warning( 0, // parent + QMessageBox::warning( parent, // parent "Error", // caption QString( "Couldn't save y2logs to %1 - " "exit code %2" ).arg( fileName ).arg( result ), @@ -234,7 +245,7 @@ << saveLogsCommand << "\" not found" << endl; - QMessageBox::warning( 0, // parent + QMessageBox::warning( parent, // parent "Error", // caption QString( "Couldn't save y2logs to %1:\n" "Command %2 not found" ).arg( fileName ).arg( saveLogsCommand ), @@ -253,7 +264,13 @@ items << "Debug logging off" << "Debug logging on"; - QString result = QInputDialog::getItem( 0, + + QWidget* parent = 0; + YDialog * currentDialog = YDialog::currentDialog( false ); + if (currentDialog) + parent = (QWidget *) currentDialog->widgetRep(); + + QString result = QInputDialog::getItem( parent, _("YaST2 Logging"), _("Configure YaST2 Logging:"), items, 0, @@ -269,12 +286,18 @@ void YQUI::toggleRecordMacro() { + QWidget* parent = 0; + YDialog * currentDialog = YDialog::currentDialog( false ); + if (currentDialog) + parent = (QWidget *) currentDialog->widgetRep(); + + if ( YMacro::recording() ) { YMacro::endRecording(); normalCursor(); - QMessageBox::information( 0, // parent + QMessageBox::information( parent, // parent "YaST2 Macro Recorder", // caption "Macro recording done.", // text QMessageBox::Ok | QMessageBox::Default, // button0 @@ -286,7 +309,7 @@ normalCursor(); QString filename = - QFileDialog::getSaveFileName( 0, + QFileDialog::getSaveFileName( parent, "Select Macro File to Record to", DEFAULT_MACRO_FILE_NAME, // startWith "*.ycp" // filter @@ -304,8 +327,14 @@ { normalCursor(); + QWidget* parent = 0; + YDialog * currentDialog = YDialog::currentDialog( false ); + if (currentDialog) + parent = (QWidget *) currentDialog->widgetRep(); + + QString filename = - QFileDialog::getOpenFileName( 0, + QFileDialog::getOpenFileName( parent, "Select Macro File to Play", DEFAULT_MACRO_FILE_NAME, // startWith "*.ycp" ); -- 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] r49678 - in /trunk/storage/storage/src/modules: Partitions.ycp Storage.ycp StorageFields.ycp
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 10:55:56 2008 New Revision: 49678 URL: http://svn.opensuse.org/viewcvs/yast?rev=49678&view=rev Log: - removed some evms code Modified: trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageFields.ycp Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Tue Aug 5 10:55:56 2008 @@ -52,7 +52,6 @@ global boolean no_fsid_menu = Arch::s390 (); global string raid_name = "MD Raid"; - global string evms_name = "EVMS"; global string lv_name = "LV"; global string dm_name = "DM"; global string loop_name = "Loop Device"; Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Aug 5 10:55:56 2008 @@ -1634,58 +1634,6 @@ c["partitions"] = add( c["partitions"]:[], p ); }); } - else if( c["type"]:`CT_UNKNOWN == `CT_EVMS ) - { - list<any> pinfos = []; - any infos = LibStorage::EvmsCoInfo::new("LibStorage::EvmsCoInfo"); - string n = c["name"]:""; - c["is_container"] = size(c["name"]:"")>0; - if( c["is_container"]:false ) - { - ret = LibStorage::StorageInterface::getEvmsCoInfo( sint, n, infos ); - if( ret==0 ) - { - c["create"] = LibStorage::EvmsCoInfo::swig_create_get(infos); - c["size_k"] = LibStorage::EvmsCoInfo::swig_sizeK_get(infos); - c["cyl_size"] = 1024*LibStorage::EvmsCoInfo::swig_peSize_get(infos); - c["pesize"] = 1024*LibStorage::EvmsCoInfo::swig_peSize_get(infos); - c["cyl_count"] = LibStorage::EvmsCoInfo::swig_peCount_get(infos); - c["pe_free"] = LibStorage::EvmsCoInfo::swig_peFree_get(infos); - c["lvm2"] = LibStorage::EvmsCoInfo::swig_lvm2_get(infos); - list<string> ls = splitstring( LibStorage::EvmsCoInfo::swig_devices_get(infos), " " ); - c["devices"] = ls; - ls = splitstring( LibStorage::EvmsCoInfo::swig_devices_add_get(infos), " " ); - if( size(ls)>0 ) - c["devices_add"] = ls; - ls = splitstring( LibStorage::EvmsCoInfo::swig_devices_rem_get(infos), " " ); - if( size(ls)>0 ) - c["devices_rem"] = ls; - } - else - y2warning( "EVMS Co \"%1\" ret:%2", c["name"]:"", ret ); - } - ret = LibStorage::StorageInterface::getEvmsInfo( sint, n, pinfos ); - if( ret<0 ) - y2warning( "getEvmsInfo ret:%1", ret ); - y2milestone( "getContainerInfo n:%1 ret=%2", n, ret ); - foreach( any info, pinfos, - ``{ - map p = $[]; - vinfo = LibStorage::EvmsInfo::swig_v_get(info); - p = volumeMap( vinfo, p ); - p["stripes"] = LibStorage::EvmsInfo::swig_stripe_get(info); - t = LibStorage::EvmsInfo::swig_stripe_size_get(info); - if( t>0 ) - p["stripesize"] = t; - boolean tbool = LibStorage::EvmsInfo::swig_compatible_get(info); - if( !tbool ) - p["evms_native"] = true; - p["type"] = `evms; - p["fstype"] = Partitions::evms_name; - y2milestone( "partition %1", p ); - c["partitions"] = add( c["partitions"]:[], p ); - }); - } else if( c["type"]:`CT_UNKNOWN == `CT_MD ) { list<any> pinfos = []; Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Tue Aug 5 10:55:56 2008 @@ -48,8 +48,6 @@ { case `UB_LVM: return "LVM " + used_by; - case `UB_EVMS: - return "EVMS " + used_by; case `UB_DM: return "DM " + used_by; case `UB_DMRAID: @@ -312,10 +310,6 @@ { value = "LVM" + (disk["lvm2"]:false ? "2 " : " ") + disk["name"]:""; } - else if(disk["type"]:`CT_UNKNOWN==`CT_EVMS) - { - value = "EVMS " + disk["name"]:""; - } else if(disk["type"]:`CT_UNKNOWN==`CT_DMRAID) { value = "BIOS RAID " + disk["name"]:""; -- 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] r49677 - /tags/stable-2_17_4/dns-server/
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 10:54:13 2008 New Revision: 49677 URL: http://svn.opensuse.org/viewcvs/yast?rev=49677&view=rev Log: Created tag stable-2_17_4 for dns-server Added: tags/stable-2_17_4/dns-server/ - copied from r49676, trunk/dns-server/ -- 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] r49676 - in /trunk/dns-server: VERSION package/yast2-dns-server.changes src/DnsServer.pm src/DnsZones.pm
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 10:54:01 2008 New Revision: 49676 URL: http://svn.opensuse.org/viewcvs/yast?rev=49676&view=rev Log: - Adjusted to the newest LDAP SCR agent (patch written by jsuchome) (FATE #303596). - 2.17.4 Modified: trunk/dns-server/VERSION trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/DnsServer.pm trunk/dns-server/src/DnsZones.pm Modified: trunk/dns-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/VERSION?rev=49676&r1=… ============================================================================== --- trunk/dns-server/VERSION (original) +++ trunk/dns-server/VERSION Tue Aug 5 10:54:01 2008 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Tue Aug 5 10:54:01 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 5 10:53:13 CEST 2008 - locilka(a)suse.cz + +- Adjusted to the newest LDAP SCR agent (patch written by jsuchome) + (FATE #303596). +- 2.17.4 + +------------------------------------------------------------------- Wed Jul 23 12:33:54 CEST 2008 - locilka(a)suse.cz - Added support for dynamic updates initiated also out of the Modified: trunk/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsServer.pm?rev=… ============================================================================== --- trunk/dns-server/src/DnsServer.pm (original) +++ trunk/dns-server/src/DnsServer.pm Tue Aug 5 10:54:01 2008 @@ -1651,7 +1651,7 @@ %found = ( 'objectclass' => [ 'top', 'suseDnsConfiguration' ], 'cn' => [ 'defaultDNS' ], - 'susedefaultbase' => [ 'ou=DNS,'.$ldap_domain ], + 'suseDefaultBase' => [ 'ou=DNS,'.$ldap_domain ], ); } else @@ -1662,7 +1662,7 @@ } # check if base DN for zones is defined - my @bases = @{ $found{"susedefaultbase"} || [] }; + my @bases = @{ $found{"suseDefaultBase"} || [] }; if (@bases == 0) { @bases = ("ou=DNS,$ldap_domain"); @@ -1773,7 +1773,7 @@ my %ldap_object = ( 'objectclass' => [ 'top', 'suseDnsConfiguration' ], 'cn' => [ 'defaultDNS' ], - 'susedefaultbase' => [ 'ou=DNS,'.$ldap_domain ], + 'suseDefaultBase' => [ 'ou=DNS,'.$ldap_domain ], ); my %ldap_request = ( "dn" => "cn=defaultDNS,$ldap_config_dn", @@ -1796,11 +1796,11 @@ my $dns_conf_dn = $keys[0]; %found = %{$found{$dns_conf_dn}}; # check if base DN for zones is defined - my @bases = @{ $found{"susedefaultbase"} || [] }; + my @bases = @{ $found{"suseDefaultBase"} || [] }; if (@bases == 0) { my %ldap_object = %found; - $ldap_object{"susedefaultbase"} = ["ou=DNS,$ldap_domain"]; + $ldap_object{"suseDefaultBase"} = ["ou=DNS,$ldap_domain"]; my %ldap_request = ( "dn" => "$dns_conf_dn", ); Modified: trunk/dns-server/src/DnsZones.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsZones.pm?rev=4… ============================================================================== --- trunk/dns-server/src/DnsZones.pm (original) +++ trunk/dns-server/src/DnsZones.pm Tue Aug 5 10:54:01 2008 @@ -471,7 +471,7 @@ my %zonemap = %{$found[0] || {}}; my $serial = $self->UpdateSerial (""); - my @soa_str_lst = @{$zonemap{"soarecord"}|| ["@ root $serial 3H 1H 1W 1D"]}; + my @soa_str_lst = @{$zonemap{"sOARecord"}|| ["@ root $serial 3H 1H 1W 1D"]}; my $soa_str = $soa_str_lst[0]; my @soa_lst = split (" ", $soa_str); @@ -479,7 +479,7 @@ $_ ne "" } @soa_lst; - my @rel_lst = @{$zonemap{"relativedomainname"}}; + my @rel_lst = @{$zonemap{"relativeDomainName"}}; my %soa = ( "expiry" => $soa_lst[5], @@ -517,7 +517,7 @@ foreach my $record_ref (@found) { my %record = %{$record_ref}; - my @rel_dn = @{$record{"relativedomainname"}}; + my @rel_dn = @{$record{"relativeDomainName"}}; my $rel_dn = $rel_dn[0]; foreach my $rec_type (@all_rec_types) @@ -571,12 +571,12 @@ my $soa_record = join (" ", @soa_lst); my %ldap_record = ( - "objectclass" => ["dnszone"], - "zonename" => [$zone], - "relativedomainname" => ["@"], - "dnsttl" => [DnsRoutines->NormalizeTime ($zone_map{"ttl"} || "2D")], - "dnsclass" => ["IN"], - "soarecord" => $soa_record, + "objectClass" => ["dNSZone"], + "zoneName" => [$zone], + "relativeDomainName" => ["@"], + "dNSTTL" => [DnsRoutines->NormalizeTime ($zone_map{"ttl"} || "2D")], + "dNSClass" => ["IN"], + "sOARecord" => $soa_record, ); my @current_records = grep { @@ -613,7 +613,7 @@ else { y2milestone ("Modifying existing record"); - delete $ldap_record{"objectclass"}; # objectclass can be changed by mail-server + delete $ldap_record{"objectClass"}; # objectclass can be changed by mail-server SCR->Write (".ldap.modify", \%ldap_cmd, \%ldap_record); } @@ -635,7 +635,7 @@ my @found = @{$found_ref}; @found = map { - my @l = @{$_->{"relativedomainname"}}; + my @l = @{$_->{"relativeDomainName"}}; $l[0]; } @found; @@ -651,7 +651,7 @@ foreach my $d (@deleted) { y2milestone ("Removing all records regarding $d"); - SCR->Write (".ldap.delete", {"dn" => "relativedomainname=$d,$zone_dn"}); + SCR->Write (".ldap.delete", {"dn" => "relativeDomainName=$d,$zone_dn"}); } # write all the other records @@ -668,11 +668,11 @@ { my $rec_dn = "relativeDomainName=$r,$zone_dn"; my %ldap_record = ( - "objectclass" => ["dnszone"], - "zonename" => [$zone], - "relativedomainname" => [$r], - "dnsttl" => [DnsRoutines->NormalizeTime ($zone_map{"ttl"} || "2D")], - "dnsclass" => ["IN"], + "objectClass" => ["dNSZone"], + "zoneName" => [$zone], + "relativeDomainName" => [$r], + "dNSTTL" => [DnsRoutines->NormalizeTime ($zone_map{"ttl"} || "2D")], + "dNSClass" => ["IN"], ); @current_records = grep { @@ -751,7 +751,7 @@ my $found = SCR->Read (".ldap.search", \%ldap_query); my @found = @{$found || []}; @found = map { - $_->{"zonename"}[0]; + $_->{"zoneName"}[0]; } @found; @found = grep { defined ($_); -- 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] r49675 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 10:45:43 2008 New Revision: 49675 URL: http://svn.opensuse.org/viewcvs/yast?rev=49675&view=rev Log: - removed obsolete function UseLilo Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Aug 5 10:45:43 2008 @@ -5553,12 +5553,6 @@ return( ret ); }; -global define boolean UseLilo() - ``{ - boolean ret = false; - y2milestone( "ret %1", ret ); - return( ret ); - } global define list<string> GetDirPatterns( string dir, list patterns ) ``{ -- 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] r49674 - in /trunk/storage/storage/src: include/loop.ycp inst_custom_part.ycp
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 10:41:27 2008 New Revision: 49674 URL: http://svn.opensuse.org/viewcvs/yast?rev=49674&view=rev Log: - removed obsolete code Removed: trunk/storage/storage/src/include/loop.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Tue Aug 5 10:41:27 2008 @@ -49,7 +49,6 @@ import "ProductFeatures"; include "partitioning/partition_defines.ycp"; - include "partitioning/loop.ycp"; include "partitioning/nfs.ycp"; include "partitioning/lvm_ui_dialogs.ycp"; include "partitioning/lvm_pv_lib.ycp"; -- 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] r49673 - /tags/stable-2_17_0/samba-server/
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 10:40:08 2008 New Revision: 49673 URL: http://svn.opensuse.org/viewcvs/yast?rev=49673&view=rev Log: Created tag stable-2_17_0 for samba-server Added: tags/stable-2_17_0/samba-server/ - copied from r49672, trunk/samba-server/ -- 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] r49672 - /trunk/storage/storage/src/include/ep-loop-dialogs.ycp
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 10:40:04 2008 New Revision: 49672 URL: http://svn.opensuse.org/viewcvs/yast?rev=49672&view=rev Log: - copied help texts Modified: trunk/storage/storage/src/include/ep-loop-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-loop-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-loop-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-loop-dialogs.ycp Tue Aug 5 10:40:04 2008 @@ -8,6 +8,41 @@ textdomain "storage"; + string MiniWorkflowStepLoopNameSizeHelp() + { + // TODO + + // help text + string help = _(" +Path Name of Loop File: This must be an absolute path to the file +containing the data for the encrypted loop device to set up. +"); + + // help text + help = help + _(" +Create Loop File: If this is checked, the file will be created +with the size given in the next field. NOTE: If the file already +exists, all data in it is lost. +"); + + // help text + help = help + _(" +Size: This is the size of the loop file. The file system to +create in the encrypted loop device will have this size. +"); + + // help text + help = help + _(" +NOTE: During installation, there cannot be any consistency +checks about file size and path names because the file system is not +accessible. It will be created at the end of installation. Be +careful about the size and path name you provide. +"); + + return help; + } + + symbol MiniWorkflowStepLoopNameSize(map<string, any> &data) { y2milestone("MiniWorkflowStepLoopNameSize data:%1", data); @@ -28,7 +63,7 @@ ) ); - MiniWorkflow::SetContents(Greasemonkey::Transform(contents), "TODO help"); + MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepLoopNameSizeHelp()); MiniWorkflow::SetLastStep(false); UI::ChangeWidget(`id(`create_file), `Value, create_file); -- 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] r49671 - in /trunk/samba-server: ./ package/ src/ users-plugin/
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 10:39:17 2008 New Revision: 49671 URL: http://svn.opensuse.org/viewcvs/yast?rev=49671&view=rev Log: - Adjusted to the newest LDAP SCR agent (patch written by jsuchome) (FATE #303596). - 2.17.0 Modified: trunk/samba-server/VERSION trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/src/SambaBackendLDAP.pm trunk/samba-server/users-plugin/UsersPluginSamba.pm trunk/samba-server/users-plugin/UsersPluginSambaGroups.pm trunk/samba-server/users-plugin/users_plugin_samba.ycp trunk/samba-server/users-plugin/users_plugin_samba_groups.ycp Modified: trunk/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/VERSION?rev=49671&r… ============================================================================== --- trunk/samba-server/VERSION (original) +++ trunk/samba-server/VERSION Tue Aug 5 10:39:17 2008 @@ -1 +1 @@ -2.16.3 +2.17.0 Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba… ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Tue Aug 5 10:39:17 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 5 10:36:39 CEST 2008 - locilka(a)suse.cz + +- Adjusted to the newest LDAP SCR agent (patch written by jsuchome) + (FATE #303596). +- 2.17.0 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz - added categories Settings and System into desktop file Modified: trunk/samba-server/src/SambaBackendLDAP.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/SambaBackendLDA… ============================================================================== --- trunk/samba-server/src/SambaBackendLDAP.pm (original) +++ trunk/samba-server/src/SambaBackendLDAP.pm Tue Aug 5 10:39:17 2008 @@ -280,14 +280,14 @@ my $templates = Ldap->GetTemplates(); while(my ($dn, $content) = each %$templates) { - my %objectclass = map {lc $_, 1} @{$content->{objectclass}}; - my %suseplugin = map {$_, 1} @{$content->{suseplugin}}; - if ($objectclass{suseusertemplate} and not $suseplugin{UsersPluginSamba}) { - push @{$content->{suseplugin}}, "UsersPluginSamba"; + my %objectClass = map {$_, 1} @{$content->{objectClass}}; + my %susePlugin = map {$_, 1} @{$content->{susePlugin}}; + if ($objectClass{suseUserTemplate} and not $susePlugin{UsersPluginSamba}) { + push @{$content->{susePlugin}}, "UsersPluginSamba"; $modified = $content->{modified} = "edited"; } - if ($objectclass{susegrouptemplate} and not $suseplugin{UsersPluginSambaGroup}) { - push @{$content->{suseplugin}}, "UsersPluginSambaGroup"; + if ($objectClass{suseGroupTemplate} and not $susePlugin{UsersPluginSambaGroup}) { + push @{$content->{susePlugin}}, "UsersPluginSambaGroup"; $modified = $content->{modified} = "edited"; } } @@ -326,8 +326,8 @@ y2milestone("Creating dn: $dn"); my $map; given($attr) { - when ("dc") {$map = {objectclass => ["top", "dcobject"], dc => $value}} - when ("ou") {$map = {objectclass => ["top", "organizationalunit"], ou => $value}} + when ("dc") {$map = {objectClass => ["top", "dcobject"], dc => $value}} + when ("ou") {$map = {objectClass => ["top", "organizationalunit"], ou => $value}} # translators: error message, followed by class giving error default {return __("Unknown Class:")." $dn\n".__("Only dcObject (dc) and organizationalUnit (ou) classes are supported.")} }; @@ -476,9 +476,9 @@ Ldap->ReadConfigModules(); my $conf = Ldap->GetConfigModules(); while(my ($dn, $c) = each %$conf) { - my %classes = map {lc $_, 1} @{$c->{objectclass}}; - @user = split ",", $c->{susedefaultbase}[0] if $classes{"suseuserconfiguration"}; - @group = split ",", $c->{susedefaultbase}[0] if $classes{"susegroupconfiguration"}; + my %classes = map {$_, 1} @{$c->{objectClass}}; + @user = split ",", $c->{suseDefaultBase}[0] if $classes{"suseUserConfiguration"}; + @group = split ",", $c->{suseDefaultBase}[0] if $classes{"suseGroupConfiguration"}; } y2milestone("SuseDefaultBase: user=".join(",",@user)." group=",join(",",@group)); } Modified: trunk/samba-server/users-plugin/UsersPluginSamba.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/users-plugin/UsersP… ============================================================================== --- trunk/samba-server/users-plugin/UsersPluginSamba.pm (original) +++ trunk/samba-server/users-plugin/UsersPluginSamba.pm Tue Aug 5 10:39:17 2008 @@ -137,7 +137,7 @@ my $config = shift; my $data = shift; - if ( grep /^sambasamaccount$/i, @{$data->{'objectclass'}} ) { + if ( grep /^sambasamaccount$/i, @{$data->{'objectClass'}} ) { y2milestone( "SambaPlugin: Plugin Present"); return 1; } else { @@ -204,8 +204,8 @@ } my $ret = $self->update_object_classes( $config, $data ); if( $ret ) { - y2internal("Could not update objectclass attribute"); - $error = __("Could not update objectclass attribute."); + y2internal("Could not update objectClass attribute"); + $error = __("Could not update objectClass attribute."); return undef; } return $data; @@ -293,7 +293,7 @@ if( ! $data->{'sambainternal'}->{'initialized'} ) { $self->init_internal_keys( $config, $data ); $data->{'sambainternal'}->{'initialized'} = 1; - } elsif ( (! $data->{'sambalmpassword'}) && + } elsif ( (! $data->{'sambaLMPassword'}) && ( (! $data->{'text_userpassword'} ) || ($data->{'text_userpassword'} eq "" )) ){ $error = __("Change the password to create the Samba account"); return undef; @@ -306,7 +306,7 @@ } $self->update_attributes ($config, $data); - if ( (! $data->{'sambalmpassword'}) ) { + if ( (! $data->{'sambaLMPassword'}) ) { y2debug ("no samba password hashes present yet"); } @@ -329,10 +329,10 @@ my $oc = "sambaSamAccount"; # define the object class for new user/groupa - if (defined $data->{"objectclass"} && ref $data->{"objectclass"} eq "ARRAY") + if (defined $data->{"objectClass"} && ref $data->{"objectClass"} eq "ARRAY") { - if ( ! grep /^$oc$/i, @{$data->{'objectclass'}} ) { - push @{$data->{'objectclass'}}, $oc; + if ( ! grep /^$oc$/i, @{$data->{'objectClass'}} ) { + push @{$data->{'objectClass'}}, $oc; y2milestone("added ObjectClass $oc"); } } @@ -342,10 +342,10 @@ sub init_internal_keys { my ($self, $config, $data) = @_; - if ( $data->{'sambaacctflags'} ) { + if ( $data->{'sambaAcctFlags'} ) { if ( ! defined( $data->{'sambadisabled'} ) ) { y2internal(" UsersPluginSamba::init_internal_keys sambadisabled undefined "); - if ( $data->{'sambaacctflags'} =~ /^\[.*D.*\]/ ) { + if ( $data->{'sambaAcctFlags'} =~ /^\[.*D.*\]/ ) { $data->{'sambadisabled'} = "1"; } else { $data->{'sambadisabled'} = "0"; @@ -353,7 +353,7 @@ } if ( ! defined( $data->{'sambanoexpire'} ) ) { y2internal(" UsersPluginSamba::init_internal_keys sambanoexpire undefined "); - if ( $data->{'sambaacctflags'} =~ /^\[.*X.*\]/ ) { + if ( $data->{'sambaAcctFlags'} =~ /^\[.*X.*\]/ ) { $data->{'sambanoexpire'} = "1"; } else { $data->{'sambanoexpire'} = "0"; @@ -367,18 +367,18 @@ my ( $self, $config, $data ) = @_; my $SID = $data->{'sambainternal'}->{'sambalocalsid'}; - my $uidNumber = $data->{'uidnumber'}; + my $uidNumber = $data->{'uidNumber'}; if ( $uidNumber ) { - if ( (! $data->{'sambasid'}) || ($data->{'sambasid'} eq "") ) { - $data->{'sambasid'} = $SID."-". ( 2 * $uidNumber + + if ( (! $data->{'sambaSID'}) || ($data->{'sambaSID'} eq "") ) { + $data->{'sambaSID'} = $SID."-". ( 2 * $uidNumber + $data->{'sambainternal'}->{'ridbase'} ); } } - my $gidNumber = $data->{'gidnumber'}; + my $gidNumber = $data->{'gidNumber'}; if ( $gidNumber ) { - if ( (! $data->{'sambaprimarygroupsid'}) || - ($data->{'sambaprimarygroupsid'} eq "") ) { - $data->{'sambaprimarygroupsid'} = $SID."-". (2 * $gidNumber + + if ( (! $data->{'sambaPrimaryGroupSID'}) || + ($data->{'sambaPrimaryGroupSID'} eq "") ) { + $data->{'sambaPrimaryGroupSID'} = $SID."-". (2 * $gidNumber + $data->{'sambainternal'}->{'ridbase'} + 1 ); } } @@ -398,7 +398,7 @@ sub update_samba_acctflags { my ($self, $config, $data) = @_; - my $acctflags = $data->{'sambaacctflags'} || "[U ]"; + my $acctflags = $data->{'sambaAcctFlags'} || "[U ]"; $acctflags =~ s/^\[(\w+)\s*\]$/$1/g; @@ -425,7 +425,7 @@ for( my $i=0; $i < ( 11 - $len ); $i++ ) { $acctflags .= " "; } - $data->{'sambaacctflags'} = "[". $acctflags ."]"; + $data->{'sambaAcctFlags'} = "[". $acctflags ."]"; return undef; } @@ -435,19 +435,19 @@ if ( $data->{'sambainternal'}->{'sambacleartextpw'} ) { my $update_timestamp = 0; my ($lmHash, $ntHash) = ntlmgen($data->{'sambainternal'}->{'sambacleartextpw'}); - if ( (!$data->{'sambalmpassword'}) || ($lmHash ne $data->{'sambalmpassword'}) ) { - $data->{'sambalmpassword'} = $lmHash; + if ( (!$data->{'sambaLMPassword'}) || ($lmHash ne $data->{'sambaLMPassword'}) ) { + $data->{'sambaLMPassword'} = $lmHash; $update_timestamp = 1; } - if ( (! $data->{'sambantpassword'}) || ( $ntHash ne $data->{'sambantpassword'} ) ) { - $data->{'sambantpassword'} = $ntHash; + if ( (! $data->{'sambaNTPassword'}) || ( $ntHash ne $data->{'sambaNTPassword'} ) ) { + $data->{'sambaNTPassword'} = $ntHash; $update_timestamp = 1; } if ( $update_timestamp ) { - $data->{'sambapwdlastset'} = time (); - $data->{'sambapwdcanchange'} = $data->{'sambapwdlastset'}; + $data->{'sambaPwdLastSet'} = time (); + $data->{'sambaPwdCanChange'} = $data->{'sambaPwdLastSet'}; } - $data->{'sambapwdmustchange'} = ( 1 << 31 ) - 1; + $data->{'sambaPwdMustChange'} = ( 1 << 31 ) - 1; } return undef; } @@ -460,7 +460,7 @@ my $res = SCR->Read(".ldap.search", { base_dn => $base_dn, scope => YaST::YCP::Integer(2), filter => "(objectClass=sambaDomain)", - attrs => ['sambasid', 'sambaalgorithmicridbase'] + attrs => ['sambaSID', 'sambaAlgorithmicRidBase'] } ); if ( ! $res ){ @@ -471,9 +471,9 @@ return "error reading samba sid"; } else { #y2milestone( Data::Dumper->Dump( [$res] )); - if ( $res->[0]->{'sambasid'}->[0] ) { - $data->{'sambainternal'}->{'sambalocalsid'} = $res->[0]->{'sambasid'}->[0]; - $data->{'sambainternal'}->{'ridbase'} = $res->[0]->{'sambaalgorithmicridbase'}->[0]; + if ( $res->[0]->{'sambaSID'}->[0] ) { + $data->{'sambainternal'}->{'sambalocalsid'} = $res->[0]->{'sambaSID'}->[0]; + $data->{'sambainternal'}->{'ridbase'} = $res->[0]->{'sambaAlgorithmicRidBase'}->[0]; return undef; } else { return "error reading samba sid"; @@ -486,7 +486,7 @@ my ( $self, $config, $data ) = @_; my @updated_oc; - foreach my $oc ( @{$data->{'objectclass'}} ) { + foreach my $oc ( @{$data->{'objectClass'}} ) { if ( lc($oc) ne "sambasamaccount" ) { push @updated_oc, $oc; } @@ -495,7 +495,7 @@ delete( $data->{'sambadisabled'}); delete( $data->{'sambainternal'}); - $data->{'objectclass'} = \@updated_oc; + $data->{'objectClass'} = \@updated_oc; } 1; # EOF Modified: trunk/samba-server/users-plugin/UsersPluginSambaGroups.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/users-plugin/UsersP… ============================================================================== --- trunk/samba-server/users-plugin/UsersPluginSambaGroups.pm (original) +++ trunk/samba-server/users-plugin/UsersPluginSambaGroups.pm Tue Aug 5 10:39:17 2008 @@ -132,7 +132,7 @@ my $config = shift; my $data = shift; - if ( grep /^sambagroupmapping$/i, @{$data->{'objectclass'}} ) { + if ( grep /^sambagroupmapping$/i, @{$data->{'objectClass'}} ) { y2milestone( "SambaPlugin: Plugin Present"); return 1; } else { @@ -285,10 +285,10 @@ my $oc = "sambaGroupMapping"; # define the object class for new user/groupa - if (defined $data->{"objectclass"} && ref $data->{"objectclass"} eq "ARRAY") + if (defined $data->{"objectClass"} && ref $data->{"objectClass"} eq "ARRAY") { - if ( ! grep /^$oc$/i, @{$data->{'objectclass'}} ) { - push @{$data->{'objectclass'}}, $oc; + if ( ! grep /^$oc$/i, @{$data->{'objectClass'}} ) { + push @{$data->{'objectClass'}}, $oc; #y2milestone("added ObjectClass $oc"); } } @@ -309,22 +309,22 @@ if (defined $data->{'sambainternal'}->{'sambalocalsid'}); my $gidNumber = 0; - $gidNumber = $data->{'gidnumber'} - if (defined $data->{'gidnumber'}); + $gidNumber = $data->{'gidNumber'} + if (defined $data->{'gidNumber'}); my $ridbase = 0; $ridbase = $data->{'sambainternal'}->{'ridbase'} if (defined $data->{'sambainternal'}->{'ridbase'}); if ( $gidNumber ) { - if ( (! $data->{'sambasid'}) || ($data->{'sambasid'} eq "") ) { - $data->{'sambasid'} = $SID."-". (2 * $gidNumber + $ridbase + 1); + if ( (! $data->{'sambaSID'}) || ($data->{'sambaSID'} eq "") ) { + $data->{'sambaSID'} = $SID."-". (2 * $gidNumber + $ridbase + 1); } } - if( ! $data->{'displayname'} ) { - $data->{'displayname'} = (defined $data->{'cn'} ? $data->{'cn'}:""); + if( ! $data->{'displayName'} ) { + $data->{'displayName'} = (defined $data->{'cn'} ? $data->{'cn'}:""); } - $data->{'sambagrouptype'} = "2"; + $data->{'sambaGroupType'} = "2"; return undef; } @@ -337,7 +337,7 @@ my $res = SCR->Read(".ldap.search", { base_dn => $base_dn, scope => YaST::YCP::Integer(2), filter => "(objectClass=sambaDomain)", - attrs => ['sambasid', 'sambaalgorithmicridbase'] + attrs => ['sambaSID', 'sambaAlgorithmicRidBase'] } ); if ( ! $res ){ @@ -347,9 +347,9 @@ y2internal("$ldaperr->{'msg'}"); } else { #y2milestone( Data::Dumper->Dump( [$res] )); - if ( $res->[0]->{'sambasid'}->[0] ) { - $data->{'sambainternal'}->{'sambalocalsid'} = $res->[0]->{'sambasid'}->[0]; - $data->{'sambainternal'}->{'ridbase'} = $res->[0]->{'sambaalgorithmicridbase'}->[0]; + if ( $res->[0]->{'sambaSID'}->[0] ) { + $data->{'sambainternal'}->{'sambalocalsid'} = $res->[0]->{'sambaSID'}->[0]; + $data->{'sambainternal'}->{'ridbase'} = $res->[0]->{'sambaAlgorithmicRidBase'}->[0]; return undef; } else { return "error reading samba sid"; @@ -362,28 +362,28 @@ my ( $self, $config, $data ) = @_; my @updated_oc; - foreach my $oc ( @{$data->{'objectclass'}} ) { + foreach my $oc ( @{$data->{'objectClass'}} ) { if ( lc($oc) ne "sambagroupmapping" ) { push @updated_oc, $oc; } } # delete( $data->{'sambainternal'}); -# delete( $data->{'sambapwdmustchange'}); -# delete( $data->{'sambapwdlastset'}); -# delete( $data->{'sambapwdcanchange'}); +# delete( $data->{'sambaPwdMustChange'}); +# delete( $data->{'sambaPwdLastSet'}); +# delete( $data->{'sambaPwdCanChange'}); # delete( $data->{'sambantpassword'}); # delete( $data->{'sambalmpassword'}); # delete( $data->{'sambaacctflags'}); -# delete( $data->{'sambahomedrive'}); -# delete( $data->{'sambahomepath'}); -# delete( $data->{'sambaprofilepath'}); -# delete( $data->{'sambalogonscript'}); -# delete( $data->{'sambasid'}); -# delete( $data->{'sambaprimarygroupssid'}); +# delete( $data->{'sambaHomeDrive'}); +# delete( $data->{'sambaHomePath'}); +# delete( $data->{'sambaProfilePath'}); +# delete( $data->{'sambaLogonScript'}); +# delete( $data->{'sambaSID'}); +# delete( $data->{'sambaPrimaryGroupSID'}); # delete( $data->{'sambanoexprire'}); # delete( $data->{'sambadisabled'}); - $data->{'objectclass'} = \@updated_oc; + $data->{'objectClass'} = \@updated_oc; return undef; } Modified: trunk/samba-server/users-plugin/users_plugin_samba.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/users-plugin/users_… ============================================================================== --- trunk/samba-server/users-plugin/users_plugin_samba.ycp (original) +++ trunk/samba-server/users-plugin/users_plugin_samba.ycp Tue Aug 5 10:39:17 2008 @@ -74,33 +74,33 @@ `VSpacing(0.5), `Frame ( _("Home Drive"), `VBox( - `TextEntry(`id(`homeDrive), "", data["sambahomedrive"]:"" ), + `TextEntry(`id(`homeDrive), "", data["sambaHomeDrive"]:"" ), `Left(`CheckBox( `id(`defhomeDrive ), `opt(`notify), _("Use Default Values"), - size (data["sambahomedrive"]:"") <= 0 + size (data["sambaHomeDrive"]:"") <= 0 )) ) ), `Frame ( _("Home Path"), `VBox( - `TextEntry(`id(`homePath), "", data["sambahomepath"]:"" ), + `TextEntry(`id(`homePath), "", data["sambaHomePath"]:"" ), `Left(`CheckBox( `id(`defhomePath ), `opt(`notify), _("Use Default Values"), - size (data["sambahomepath"]:"") <= 0 + size (data["sambaHomePath"]:"") <= 0 )) ) ), `Frame ( _("Profile Path"), `VBox( - `TextEntry(`id(`profilePath), "", data["sambaprofilepath"]:"" ), + `TextEntry(`id(`profilePath), "", data["sambaProfilePath"]:"" ), `Left(`CheckBox( `id(`defprofilePath ), `opt(`notify), _("Use Default Values"), - size (data["sambaprofilepath"]:"") <= 0)) + size (data["sambaProfilePath"]:"") <= 0)) ) ), // translators: logon is the Windows synonym for login `Frame ( _("Logon Script"), `VBox( - `TextEntry(`id(`logonScript), "", data["sambalogonscript"]:"" ), + `TextEntry(`id(`logonScript), "", data["sambaLogonScript"]:"" ), `Left(`CheckBox( `id(`deflogonScript ), `opt(`notify), _("Use Default Values"), - size (data["sambalogonscript"]:"") <= 0)) + size (data["sambaLogonScript"]:"") <= 0)) ) ), `VSpacing (1.5), @@ -138,35 +138,35 @@ string err = UsersPluginSamba::Check ( config, data); if ((boolean) UI::QueryWidget(`id(`defhomeDrive), `Value)) { - data["sambahomedrive"] = ""; + data["sambaHomeDrive"] = ""; } else { - data["sambahomedrive"] = UI::QueryWidget(`id(`homeDrive), `Value ); + data["sambaHomeDrive"] = UI::QueryWidget(`id(`homeDrive), `Value ); } if ((boolean) UI::QueryWidget(`id(`defhomePath), `Value)) { - data["sambahomepath"] = ""; + data["sambaHomePath"] = ""; } else { - data["sambahomepath"] = UI::QueryWidget(`id(`homePath), `Value ); + data["sambaHomePath"] = UI::QueryWidget(`id(`homePath), `Value ); } if ((boolean) UI::QueryWidget(`id(`defprofilePath), `Value)) { - data["sambaprofilepath"] = ""; + data["sambaProfilePath"] = ""; } else { - data["sambaprofilepath"] = UI::QueryWidget(`id(`profilePath), `Value ); + data["sambaProfilePath"] = UI::QueryWidget(`id(`profilePath), `Value ); } if ((boolean) UI::QueryWidget(`id(`deflogonScript), `Value)) { - data["sambalogonscript"] = ""; + data["sambaLogonScript"] = ""; } else { - data["sambalogonscript"] = UI::QueryWidget(`id(`logonScript), `Value ); + data["sambaLogonScript"] = UI::QueryWidget(`id(`logonScript), `Value ); } data["sambanoexpire"] = ( UI::QueryWidget(`id(`noExpire), `Value ) == true ) ? "1" : "0"; data["sambadisabled"] = ( UI::QueryWidget(`id(`disable), `Value ) == true ) ? "1" : "0"; Modified: trunk/samba-server/users-plugin/users_plugin_samba_groups.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/users-plugin/users_… ============================================================================== --- trunk/samba-server/users-plugin/users_plugin_samba_groups.ycp (original) +++ trunk/samba-server/users-plugin/users_plugin_samba_groups.ycp Tue Aug 5 10:39:17 2008 @@ -77,7 +77,7 @@ contents = `HBox(`HSpacing (1.5), `VBox( `VSpacing(0.5), - `TextEntry(`id(`smbName), _("Samba Group Name"), data["displayname"]:"" ), + `TextEntry(`id(`smbName), _("Samba Group Name"), data["displayName"]:"" ), `VSpacing (0.5) ), `HSpacing (1.5) @@ -99,7 +99,7 @@ if ( ret == `next ) { string err = UsersPluginSambaGroups::Check ( config, data); - data["displayname"] = UI::QueryWidget(`id(`smbName), `Value ); + data["displayName"] = UI::QueryWidget(`id(`smbName), `Value ); if (err != "") { Report::Error (err); -- 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] r49670 - in /trunk/network: package/yast2-network.changes src/lan/help.ycp
by mzugec＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: mzugec Date: Tue Aug 5 10:29:52 2008 New Revision: 49670 URL: http://svn.opensuse.org/viewcvs/yast?rev=49670&view=rev Log: improved help text (bnc#376063) Modified: trunk/network/package/yast2-network.changes trunk/network/src/lan/help.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Aug 5 10:29:52 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Aug 5 10:28:41 CEST 2008 - mzugec(a)suse.cz + +- improved help text (bnc#376063) + +------------------------------------------------------------------- Mon Aug 4 15:56:34 CEST 2008 - mzugec(a)suse.cz - for ssh/vnc installation don't reload/restart network because Modified: trunk/network/src/lan/help.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/help.ycp?rev=496… ============================================================================== --- trunk/network/src/lan/help.ycp (original) +++ trunk/network/src/lan/help.ycp Tue Aug 5 10:29:52 2008 @@ -169,7 +169,7 @@ /* Address dialog help 6/8 */ "netmask": _("For Static Address Setup enter the static IP address for your computer (for example: <tt>192.168.100.99</tt>) and -the network mask (usually <tt>255.255.255.0</tt>). Optionally, you can enter +the network mask (usually <tt>255.255.255.0</tt> or just lenght of prefix <tt>/24</tt>). For special case - unconfigured interface use <tt>0.0.0.0</tt> and <tt>/32</tt>.Optionally, you can enter a fully qualified hostname for this IP address. The hostname will be written to <tt>/etc/hosts</tt>. ") + -- 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] r49669 - /tags/stable-2_17_0/inetd/
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 10:27:37 2008 New Revision: 49669 URL: http://svn.opensuse.org/viewcvs/yast?rev=49669&view=rev Log: Created tag stable-2_17_0 for inetd Added: tags/stable-2_17_0/inetd/ - copied from r49668, trunk/inetd/ -- 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] r49668 - in /trunk/inetd: package/yast2-inetd.changes yast2-inetd.spec.in
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 10:25:51 2008 New Revision: 49668 URL: http://svn.opensuse.org/viewcvs/yast?rev=49668&view=rev Log: - Package documentation has been moved into new yast2-inetd-doc. Modified: trunk/inetd/package/yast2-inetd.changes trunk/inetd/yast2-inetd.spec.in Modified: trunk/inetd/package/yast2-inetd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/package/yast2-inetd.change… ============================================================================== --- trunk/inetd/package/yast2-inetd.changes (original) +++ trunk/inetd/package/yast2-inetd.changes Tue Aug 5 10:25:51 2008 @@ -2,6 +2,7 @@ Tue Aug 5 09:45:07 CEST 2008 - locilka(a)suse.cz - Adjusted to the newest default configurations. +- Package documentation has been moved into new yast2-inetd-doc. - 2.17.0 ------------------------------------------------------------------- Modified: trunk/inetd/yast2-inetd.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/yast2-inetd.spec.in?rev=49… ============================================================================== --- trunk/inetd/yast2-inetd.spec.in (original) +++ trunk/inetd/yast2-inetd.spec.in Tue Aug 5 10:25:51 2008 @@ -12,10 +12,10 @@ BuildArchitectures: noarch -Summary: Configuration of xinetd +Summary: YaST2 - Network Services Configuration %description -- +The YaST2 component for configuring the inetd and xinetd daemons. @PREP@ @@ -35,4 +35,18 @@ @moduledir@/Inetd.ybc @desktopdir@/inetd.desktop @schemadir@/autoyast/rnc/inetd.rnc + +%package doc +Group: System/YaST + +Requires: yast2-inetd +Provides: yast2-inetd:/usr/share/doc/packages/yast2-inetd/ + +Summary: YaST2 - Network Services Configuration (documentation) + +%description doc +The YaST2 component for configuring the inetd and xinetd daemons (documentation). + +%files doc +%defattr(-,root,root) %doc @docdir@ -- 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] r49667 - in /trunk/storage/storage/src: include/raid_ui.ycp inst_custom_part.ycp
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 10:14:37 2008 New Revision: 49667 URL: http://svn.opensuse.org/viewcvs/yast?rev=49667&view=rev Log: - removed obsolete code Removed: trunk/storage/storage/src/include/raid_ui.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Tue Aug 5 10:14:37 2008 @@ -54,7 +54,6 @@ include "partitioning/lvm_ui_dialogs.ycp"; include "partitioning/lvm_pv_lib.ycp"; include "partitioning/raid_lib.ycp"; - include "partitioning/raid_ui.ycp"; include "partitioning/custom_part_lib.ycp"; include "partitioning/custom_part_dialogs.ycp"; include "partitioning/custom_part_check_generated.ycp"; @@ -2585,9 +2584,6 @@ } else if( part["type"]:`unknown == `sw_raid ) { - RaidExpertDlg( `settings, id, part, - FileSystems::GetAllFileSystems(true,true), - false, tg ); } else if( part["type"]:`unknown == `evms ) { -- 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] r49666 - /trunk/storage/storage/src/include/ep-raid-dialogs.ycp
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 10:11:15 2008 New Revision: 49666 URL: http://svn.opensuse.org/viewcvs/yast?rev=49666&view=rev Log: - copied help texts Modified: trunk/storage/storage/src/include/ep-raid-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-raid-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-dialogs.ycp Tue Aug 5 10:11:15 2008 @@ -42,6 +42,43 @@ } + string MiniWorkflowStepRaidTypeDevicesHelp() + { + // TODO + + // help text + string help = _("RAID 0: This level increases your disk performance. +There is NO redundancy in this mode. If one of the drives crashes, data recovery will not be possible. +"); + + // help text + help = help + _("RAID 1: This mode has the best redundancy. It can be +used with two or more disks. This mode maintains an exact copy of all data on all +disks. As long as at least one disk is still working, no data is lost. The partitions +used for this type of RAID should have approximately the same size. +"); + + // help text + help = help + _("RAID 5: This mode combines management of a larger number +of disks and still maintains some redundancy. This mode can be used on three disks or more. +If one disk fails, all data is still intact. If two disks fail simultaneously, all data is lost +"); + + // help text + help = help + _("Add partitions to your RAID. According to +the RAID type, the usable disk size is the sum of these partitions (RAID0), the size +of the smallest partition (RAID 1), or (N-1)*smallest partition (RAID 5). +"); + + // help text + help = help + _("Generally, the partitions should be on different drives, +to get the redundancy and performance you want. +"); + + return help; + } + + symbol MiniWorkflowStepRaidTypeDevices(map<string, any> &data) { y2milestone("MiniWorkflowStepRaidTypeDevices data:%1", data); @@ -89,7 +126,7 @@ _("Available Devices:"), _("Selected Devices:"))); - MiniWorkflow::SetContents(Greasemonkey::Transform(contents), "TODO help"); + MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepRaidTypeDevicesHelp()); MiniWorkflow::SetLastStep(false); symbol widget = nil; @@ -136,6 +173,25 @@ } + string MiniWorkflowStepRaidOptionsHelp() + { + // TODO + + // help text + string help = _("chunk size: It is the smallest \"atomic\" mass +of data that can be written to the devices. A reasonable chunk size for RAID 5 is 128KB. For RAID 0, +32 KB is a good starting point. For RAID 1, the chunk size does not affect the array very much. +"); + + // help text + help = help + _("parity algorithm: The parity algorithm to use with RAID5. +Left-symmetric is the one that offers maximum performance on typical disks with rotating platters. +"); + + return help; + } + + symbol MiniWorkflowStepRaidOptions(map<string, any> &data) { y2milestone("MiniWorkflowStepRaidOptions data:%1", data); @@ -165,7 +221,7 @@ term contents = `HVSquash(`Frame(_("RAID Options"), options)); - MiniWorkflow::SetContents(Greasemonkey::Transform(contents), "TODO help"); + MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepRaidOptionsHelp()); MiniWorkflow::SetLastStep(false); symbol widget = nil; -- 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] r49665 - /tags/stable-2_17_0/inetd/
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 10:06:48 2008 New Revision: 49665 URL: http://svn.opensuse.org/viewcvs/yast?rev=49665&view=rev Log: Split into two packages Removed: tags/stable-2_17_0/inetd/ -- 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] r49664 - /tags/stable-2_17_0/inetd/
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 09:54:09 2008 New Revision: 49664 URL: http://svn.opensuse.org/viewcvs/yast?rev=49664&view=rev Log: Created tag stable-2_17_0 for inetd Added: tags/stable-2_17_0/inetd/ - copied from r49663, trunk/inetd/ -- 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] r49663 - in /trunk/inetd: VERSION package/yast2-inetd.changes src/all-services.sh src/default_conf_xinetd.ycp
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 09:45:58 2008 New Revision: 49663 URL: http://svn.opensuse.org/viewcvs/yast?rev=49663&view=rev Log: - Adjusted to the newest default configurations. - 2.17.0 Modified: trunk/inetd/VERSION trunk/inetd/package/yast2-inetd.changes trunk/inetd/src/all-services.sh trunk/inetd/src/default_conf_xinetd.ycp Modified: trunk/inetd/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/VERSION?rev=49663&r1=49662… ============================================================================== --- trunk/inetd/VERSION (original) +++ trunk/inetd/VERSION Tue Aug 5 09:45:58 2008 @@ -1 +1 @@ -2.16.0 +2.17.0 Modified: trunk/inetd/package/yast2-inetd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/package/yast2-inetd.change… ============================================================================== --- trunk/inetd/package/yast2-inetd.changes (original) +++ trunk/inetd/package/yast2-inetd.changes Tue Aug 5 09:45:58 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 5 09:45:07 CEST 2008 - locilka(a)suse.cz + +- Adjusted to the newest default configurations. +- 2.17.0 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz - added categories Settings and System into desktop file Modified: trunk/inetd/src/all-services.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/src/all-services.sh?rev=49… ============================================================================== --- trunk/inetd/src/all-services.sh (original) +++ trunk/inetd/src/all-services.sh Tue Aug 5 09:45:58 2008 @@ -89,10 +89,10 @@ ln -snf ../agents servers_non_y2 echo Proceeding in YCP -Y2DIR=. /sbin/yast2 ${SX}_create.ycp +Y2DIR=. /sbin/yast2 ./${SX}_create.ycp echo Converting Xpaths -change_X11_paths ${SX}_xinetd.ycp +change_X11_paths ./${SX}_xinetd.ycp # appease check_ycp -add_header ${SX}_xinetd.ycp +add_header ./${SX}_xinetd.ycp Modified: trunk/inetd/src/default_conf_xinetd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/src/default_conf_xinetd.yc… ============================================================================== --- trunk/inetd/src/default_conf_xinetd.ycp (original) +++ trunk/inetd/src/default_conf_xinetd.ycp Tue Aug 5 09:45:58 2008 @@ -219,6 +219,42 @@ "wait" : true ], $[ + "comment" : " default: off\n description: A discard server. This is the tcp version.\n", + "comment_inside" : "", + "enabled" : false, + "group" : "", + "iid" : "1:./etc/xinetd.d/discard", + "package" : "", + "protocol" : "tcp", + "rpc_version" : "", + "script" : "discard", + "server" : "", + "server_args" : "", + "service" : "discard", + "socket_type" : "stream", + "unparsed" : "\ttype\t\t= INTERNAL\n\tid\t\t= discard-stream\n\tFLAGS\t\t= IPv6 IPv4\n", + "user" : "root", + "wait" : false + ], + $[ + "comment" : " default: off\n description: A discard server. This is the udp version.\n", + "comment_inside" : "", + "enabled" : false, + "group" : "", + "iid" : "1:./etc/xinetd.d/discard-udp", + "package" : "", + "protocol" : "udp", + "rpc_version" : "", + "script" : "discard-udp", + "server" : "", + "server_args" : "", + "service" : "discard", + "socket_type" : "dgram", + "unparsed" : "\ttype\t\t= INTERNAL UNLISTED\n\tid\t\t= discard-dgram\n\tport\t\t= 9\n\tFLAGS\t\t= IPv6 IPv4\n", + "user" : "root", + "wait" : true + ], + $[ "comment" : " change \"disable = yes\" to \"disable = no\" and restart xinetd to\n use http-streaming from port 8080 with dvbd\n\n description: http streaming for dvbd\n", "comment_inside" : "\tserver\t\t= /usr/bin/dvbcat-network\n", "enabled" : false, @@ -273,6 +309,24 @@ "wait" : true ], $[ + "comment" : " default: off\n description: The encrypting kerberized rlogin server accepts BSD-style rlogin sessions, \\\n but uses Kerberos 5 authentication.\n", + "comment_inside" : "", + "enabled" : false, + "group" : "", + "iid" : "1:./etc/xinetd.d/eklogin", + "package" : "krb5-apps-servers", + "protocol" : "", + "rpc_version" : "", + "script" : "eklogin", + "server" : "/usr/lib/mit/sbin/klogind", + "server_args" : "-e -5 -c", + "service" : "eklogin", + "socket_type" : "stream", + "unparsed" : "\tflags\t\t= REUSE\n", + "user" : "root", + "wait" : false + ], + $[ "comment" : " default: off\n description: The fam server answers requests via libfam. \\\n\tIt is used to report file or directory changes to monitoring \\\n\tclients. \n", "comment_inside" : "", "enabled" : false, @@ -490,7 +544,7 @@ ], $[ "comment" : " default: off\n description: NRPE (Nagios Remote Plugin Executor)\n", - "comment_inside" : "only_from = 127.0.0.1\n", + "comment_inside" : "\tonly_from = 127.0.0.1\n", "enabled" : false, "group" : "nogroup", "iid" : "1:./etc/xinetd.d/nagios-nrpe", @@ -502,7 +556,7 @@ "server_args" : "-c /etc/nagios/nrpe.cfg --inetd", "service" : "nrpe", "socket_type" : "stream", - "unparsed" : " \tflags = REUSE\n\ttype = UNLISTED\n\tport = 5666\n \tlog_on_failure += USERID\n", + "unparsed" : " \tflags = REUSE\n type = UNLISTED\n\tport\t\t= 5666 \n \tlog_on_failure += USERID\n", "user" : "nobody", "wait" : false ], @@ -526,9 +580,9 @@ ], $[ "comment" : " default: off\n description: NSCA (Nagios Service Check Acceptor)\n", - "comment_inside" : "only_from = 127.0.0.1\n", + "comment_inside" : "\tonly_from = 127.0.0.1\n", "enabled" : false, - "group" : "daemon", + "group" : "nagios", "iid" : "1:./etc/xinetd.d/nsca", "package" : "nagios-nsca", "protocol" : "", @@ -538,8 +592,8 @@ "server_args" : "-c /etc/nagios/nsca.cfg --inetd", "service" : "nsca", "socket_type" : "stream", - "unparsed" : " \tflags = REUSE\n\ttype = UNLISTED\n\tport = 5667\n \tlog_on_failure += USERID\n", - "user" : "daemon", + "unparsed" : " \tflags = REUSE\n type = UNLISTED\n port = 5667\n \tlog_on_failure += USERID\n", + "user" : "nagios", "wait" : false ], $[ @@ -710,7 +764,7 @@ "enabled" : false, "group" : "root", "iid" : "1:./etc/xinetd.d/sane-port", - "package" : "sane", + "package" : "sane-backends", "protocol" : "", "rpc_version" : "", "script" : "sane-port", @@ -777,7 +831,7 @@ "wait" : false ], $[ - "comment" : "\n The Internet secure UUCP service.\n\n Find UUCP config examples at /usr/share/doc/packages/uucp/cfg_example/\n There are also the suucp-*.conf files required for a stunnel driven SUUCP\n client and server configuration.\n", + "comment" : "\n The Internet secure UUCP service.\n\n Find UUCP config examples at\n /usr/share/doc/packages/uucp/cfg_example/taylor_config/\n There are also the suucp-*.conf files required for a stunnel\n driven SUUCP client and server configuration.\n\n This xinetd configuration file covers the servers side with\n suucp-server.conf as argument for the stunnel exectuable.\n\n", "comment_inside" : "", "enabled" : false, "group" : "", @@ -795,6 +849,25 @@ "wait" : false ], $[ + "comment" : " default: off\n description: readonly access to a subversion repository\n", + "comment_inside" : "", + "enabled" : false, + "group" : "svn", + "groups" : "yes", + "iid" : "1:./etc/xinetd.d/svnserve", + "package" : "subversion", + "protocol" : "tcp", + "rpc_version" : "", + "script" : "svnserve", + "server" : "/usr/bin/svnserve", + "server_args" : "--read-only --root=/srv/svn/repos --inetd", + "service" : "svn", + "socket_type" : "stream", + "unparsed" : "", + "user" : "svn", + "wait" : false + ], + $[ "comment" : " SWAT is the Samba Web Administration Tool.\n", "comment_inside" : "", "enabled" : false, @@ -880,7 +953,7 @@ "server_args" : "-s /tftpboot", "service" : "tftp", "socket_type" : "dgram", - "unparsed" : "", + "unparsed" : "\tflags\t\t\t= IPv6 IPv4\n", "user" : "root", "wait" : true ], @@ -921,7 +994,7 @@ "wait" : true ], $[ - "comment" : "\n The Internet UUCP service.\n \n Find UUCP config examples at /usr/share/doc/packages/uucp/cfg_example/\n", + "comment" : "\n The Internet UUCP service.\n \n Find UUCP config examples at\n /usr/share/doc/packages/uucp/cfg_example/taylor_config/\n\n", "comment_inside" : " Activate the bind statement if you use the secure UUCP (SUUCP) service. In\n this case you do not need to bind uucp on any external interface.\n bind\t= localhost\n", "enabled" : false, "group" : "", @@ -949,7 +1022,7 @@ "rpc_version" : "", "script" : "vnc", "server" : x_bin_path + "/Xvnc", - "server_args" : ":42 -inetd -once -query localhost -geometry 1024x768 -depth 16", + "server_args" : "-noreset -inetd -once -query localhost -geometry 1024x768 -depth 16", "service" : "vnc1", "socket_type" : "stream", "unparsed" : "\ttype\t\t= UNLISTED\n\tport\t\t= 5901\n", @@ -967,7 +1040,7 @@ "rpc_version" : "", "script" : "vnc", "server" : x_bin_path + "/Xvnc", - "server_args" : ":42 -inetd -once -query localhost -geometry 1280x1024 -depth 16", + "server_args" : "-noreset -inetd -once -query localhost -geometry 1280x1024 -depth 16", "service" : "vnc2", "socket_type" : "stream", "unparsed" : "\ttype\t\t= UNLISTED\n\tport\t\t= 5902\n", @@ -985,7 +1058,7 @@ "rpc_version" : "", "script" : "vnc", "server" : x_bin_path + "/Xvnc", - "server_args" : ":42 -inetd -once -query localhost -geometry 1600x1200 -depth 16", + "server_args" : "-noreset -inetd -once -query localhost -geometry 1600x1200 -depth 16", "service" : "vnc3", "socket_type" : "stream", "unparsed" : "\ttype\t\t= UNLISTED\n\tport\t\t= 5903\n", -- 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] r49662 - in /trunk/doc: _build-www.sh tdg/Makefile.am tdg/list_of_books.txt tdg/yast.xml webpage/layout.xml
by locilka＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: locilka Date: Tue Aug 5 09:40:30 2008 New Revision: 49662 URL: http://svn.opensuse.org/viewcvs/yast?rev=49662&view=rev Log: Package bindings in docu - final version At least for not... Modified: trunk/doc/_build-www.sh trunk/doc/tdg/Makefile.am trunk/doc/tdg/list_of_books.txt trunk/doc/tdg/yast.xml trunk/doc/webpage/layout.xml Modified: trunk/doc/_build-www.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/_build-www.sh?rev=49662&r1=4… ============================================================================== --- trunk/doc/_build-www.sh (original) +++ trunk/doc/_build-www.sh Tue Aug 5 09:40:30 2008 @@ -202,6 +202,15 @@ make ${MAKE_PARAMS} >> ${BUILDLOG} 2>>${BUILDLOG} || (echo "5 exiting..." && exit 42) checkforerrors +# Creating pkg-bindings +cd ${SRCDIR} +make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} +cd pkg-bindings/doc +echo "| Current directory: "`pwd` +rm -rf html >> ${BUILDLOG} 2>>${BUILDLOG} +make >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors + # Checks the main doc directory # Builds the basic html doc echo @@ -211,8 +220,10 @@ echo "| Current directory: "`pwd` make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} checkforerrors +echo "*** CLEANUP ***" >> ${BUILDLOG} 2>>${BUILDLOG} make clean >> ${BUILDLOG} 2>>${BUILDLOG} checkforerrors +echo "*** BUILDING ***" >> ${BUILDLOG} 2>>${BUILDLOG} make >> ${BUILDLOG} 2>>${BUILDLOG} || (echo "6 exiting..." && exit 42) checkforerrors @@ -310,6 +321,7 @@ echo "| Current directory: "`pwd` mkdir -pv ${TGTDIR}styleguide >> ${BUILDLOG} 2>>${BUILDLOG} cp -arf ${DOCDIR}styleguide/html/. ${TGTDIR}styleguide/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors echo echo "*** COPYING CODINGRULES ***" @@ -317,13 +329,16 @@ echo "| Current directory: "`pwd` mkdir -pv ${TGTDIR}codingrules >> ${BUILDLOG} 2>>${BUILDLOG} cp -arf ${DOCDIR}codingrules/html/. ${TGTDIR}codingrules/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors echo echo "*** COPYING TUTORIALS ***" echo "*** COPYING TUTORIALS ***" >> ${BUILDLOG} 2>>${BUILDLOG} echo "| Current directory: "`pwd` mkdir -pv ${TGTDIR}tutorials >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors cp -arf ${DOCDIR}tutorials/html/. ${TGTDIR}tutorials/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors # Calls a script which installs YaST-based rpm's from work to the # ${TMPDIR} directory, builds the YCP Modules, Perl Modules and @@ -351,12 +366,29 @@ echo "*** COPYING -onefile DOCUMENTATION ***" echo "*** COPYING -onefile DOCUMENTATION ***" >> ${BUILDLOG} 2>>${BUILDLOG} mkdir -p cd ${TGTDIR}/onefile >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors cp -afv ${DOCDIR}modules/modules-onefile.html ${TGTDIR}onefile/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors cp -afv ${DOCDIR}perlmodules/perlmodules-onefile.html ${TGTDIR}onefile/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors cp -afv ${DOCDIR}scr/scr-onefile.html ${TGTDIR}onefile/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors cp -afv ${DOCDIR}styleguide/style-onefile.html ${TGTDIR}onefile/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors cp -afv ${DOCDIR}tdg/yast-onefile.html ${TGTDIR}onefile/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors cp -afv ${DOCDIR}tutorials/tutorial-onefile.html ${TGTDIR}onefile/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors + +echo "*** COPYING pkg-bindings ***" +echo "*** COPYING pkg-bindings ***" >> ${BUILDLOG} 2>>${BUILDLOG} +echo "| Current directory: "`pwd` +mkdir -pv ${TGTDIR}/pkg-bindings >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors +cp -arfv ${SRCDIR}/pkg-bindings/doc/html/*.html ${TGTDIR}/pkg-bindings/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors +cp -afv ${TGTDIR}/style/default.css ${TGTDIR}/pkg-bindings/yast2docs.css >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors echo echo "*** Creating TGZ archive '"${PRODUCT}".tgz' from all the documentation ***" Modified: trunk/doc/tdg/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/tdg/Makefile.am?rev=49662&r1… ============================================================================== --- trunk/doc/tdg/Makefile.am (original) +++ trunk/doc/tdg/Makefile.am Tue Aug 5 09:40:30 2008 @@ -3,7 +3,7 @@ # XMLFILES=$(wildcard *.xml introduction/*.xml) -SUBDIRS = installation development ycp ui pkg-bindings library +SUBDIRS = installation development ycp ui library STYLESHEET_CSS = ../style/default.css all-local: html Modified: trunk/doc/tdg/list_of_books.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/tdg/list_of_books.txt?rev=49… ============================================================================== --- trunk/doc/tdg/list_of_books.txt (original) +++ trunk/doc/tdg/list_of_books.txt Tue Aug 5 09:40:30 2008 @@ -10,4 +10,3 @@ Book-YaSTDevtools Book-YaSTReference Book-UIReference -Book-pkg-bindings Modified: trunk/doc/tdg/yast.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/tdg/yast.xml?rev=49662&r1=49… ============================================================================== --- trunk/doc/tdg/yast.xml (original) +++ trunk/doc/tdg/yast.xml Tue Aug 5 09:40:30 2008 @@ -17,14 +17,11 @@ <!ENTITY modules SYSTEM "modules/modules.xml"> <!ENTITY app_ref SYSTEM "reference/app_ref.xml"> <!ENTITY generated-docu SYSTEM "generated-docu/documentation.xml"> -<!ENTITY generated-pkg-bindings SYSTEM "pkg-bindings/builtins.xml"> - <!ENTITY % installation-entities SYSTEM "installation/entities"> <!ENTITY % library-entities SYSTEM "library/entities"> <!ENTITY % development-entities SYSTEM "development/entities"> <!ENTITY % ycpbuiltins-entities SYSTEM "ycp/entities"> -<!ENTITY % pkgbuiltins-entities SYSTEM "pkg-bindings/entities"> <!ENTITY % ui-entities SYSTEM "ui/entities">  %installation-entities; @@ -32,7 +29,6 @@ %development-entities; %ycpbuiltins-entities; %ui-entities; -%pkgbuiltins-entities; ]> <set> @@ -104,7 +100,6 @@ <chapter> <title>Modules and Libraries</title> &packages-section; - &pkg-bindings-section; &popups; &CommandLine-section; &runlevel-section; @@ -188,33 +183,4 @@ &YCP-UI-richtext; </book> - - - - - &generated-pkg-bindings; </set> Modified: trunk/doc/webpage/layout.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/webpage/layout.xml?rev=49662… ============================================================================== --- trunk/doc/webpage/layout.xml (original) +++ trunk/doc/webpage/layout.xml Tue Aug 5 09:40:30 2008 @@ -56,6 +56,9 @@ <tocentry id="scr" href="scr/index.html"> <title>SCR Agents</title> </tocentry> + <tocentry id="pkg-bindings" href="pkg-bindings/index.html"> + <title>Package Bindings</title> + </tocentry> </tocentry> <tocentry id="guides" href="index.html"> <title>Guides</title> -- 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] r49661 - /trunk/storage/POTFILES
by aschnell＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: aschnell Date: Mon Aug 4 21:53:08 2008 New Revision: 49661 URL: http://svn.opensuse.org/viewcvs/yast?rev=49661&view=rev Log: - no translations from evms files Modified: trunk/storage/POTFILES Modified: trunk/storage/POTFILES URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/POTFILES?rev=49661&r1=49… ============================================================================== --- trunk/storage/POTFILES (original) +++ trunk/storage/POTFILES Mon Aug 4 21:53:08 2008 @@ -6,8 +6,6 @@ libstorage/src/DmCo.cc libstorage/src/EtcFstab.cc libstorage/src/EtcRaidtab.cc -libstorage/src/Evms.cc -libstorage/src/EvmsCo.cc libstorage/src/Loop.cc libstorage/src/LoopCo.cc libstorage/src/LvmLv.cc -- 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] r49660 - /trunk/storage/storage/doc/config.xml.description
by aschnell＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: aschnell Date: Mon Aug 4 21:52:07 2008 New Revision: 49660 URL: http://svn.opensuse.org/viewcvs/yast?rev=49660&view=rev Log: - removed evms entries Modified: trunk/storage/storage/doc/config.xml.description Modified: trunk/storage/storage/doc/config.xml.description URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/doc/config.xml.d… ============================================================================== --- trunk/storage/storage/doc/config.xml.description (original) +++ trunk/storage/storage/doc/config.xml.description Mon Aug 4 21:52:07 2008 @@ -18,7 +18,7 @@ filesystem. With this setting a disk with 20 Gig available space will result in roughly 8Gig for root filesystem and 12Gig for /home filesystem. Be aware that there are upper and lower limits for root filesystem size - determined by "root_base_size" and "root_max_size". + determined by "root_base_size" and "root_max_size". Current Value SL: 40 SLES: 40 SLED: 40 root_base_size: @@ -35,27 +35,16 @@ proposal_lvm: Determines if a proposal based on LVM is created as default. - Only one of proposal_lvm and proposal_evms can be set to true. - -proposal_evms: - Determines if a proposal based on EVMS is created as default. - Only one of proposal_lvm and proposal_evms can be set to true. vm_desired_size: The size the proposal tries to allocate for the volume group if it needs to create a new volume group. If a suitable volume group is already on the disks this is used and no new volume group is created. - This value is only used if either proposal_lvm or proposal_evms is true. + This value is only used if proposal_lvm is true. vm_home_max_size: Maximal size of home filesystem if a separate filesystem for /home is to be created. The proposal will not suggest to create a larger filesystem than this limit. - This value is only used if either proposal_lvm or proposal_evms is true. - -boot_evms: - If this is set to true, proposal will use an compatible evms volume like - /dev/evms/sda1 for boot partition instead of traditional /dev/sda1. - This feature is requested for OES installation. - + This value is only used if proposal_lvm is true. -- 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] r49659 - /trunk/storage/libstorage/src/Storage.cc
by aschnell＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: aschnell Date: Mon Aug 4 21:37:59 2008 New Revision: 49659 URL: http://svn.opensuse.org/viewcvs/yast?rev=49659&view=rev Log: - do not catch everything Modified: trunk/storage/libstorage/src/Storage.cc Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Mon Aug 4 21:37:59 2008 @@ -1058,13 +1058,6 @@ catch (LockException& e) { locker_pid = e.GetLockerPid(); - y2mil("returning NULL"); - return NULL; - } - catch (...) - { - locker_pid = 0; - y2mil("returning NULL"); return NULL; } } -- 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] r49658 - /trunk/storage/storage/src/include/partition_defines.ycp
by aschnell＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: aschnell Date: Mon Aug 4 20:26:43 2008 New Revision: 49658 URL: http://svn.opensuse.org/viewcvs/yast?rev=49658&view=rev Log: - moved function Modified: trunk/storage/storage/src/include/partition_defines.ycp Modified: trunk/storage/storage/src/include/partition_defines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/part… ============================================================================== --- trunk/storage/storage/src/include/partition_defines.ycp (original) +++ trunk/storage/storage/src/include/partition_defines.ycp Mon Aug 4 20:26:43 2008 @@ -58,9 +58,78 @@ // // 8 is 8k // 16K == 16k == 16KB == 16kb +// TODO: remove define integer kmgt_str_to_byte( string input ) - ``{ - return( Storage::KmgtStrToByte( input )); +{ + integer number = 0; + integer pos = findfirstnotof( input, " +" ); + + if( pos != nil && pos>0 ) + { + input = substring( input, pos ); + } + + if( size(filterchars(input, "0123456789kKmMgGtTbBoO .")) != size(input)) + { + return(0); + } + + input = filterchars(input, "0123456789kKmMgGtTbBoO."); + + if( size(input)>0 && findfirstnotof( input, "0123456789.") != nil ) + { + // check whether the last char is in "kKmM" or "bB" + string last_char = substring( input, size(input)-1, 1); + + if( last_char == "b" || last_char == "B" || + last_char == "o" || last_char == "O" ) + { + input = substring( input, 0, size(input)-1); + // check whether the last char is in "kKmM" + last_char = substring( input, size(input)-1, 1); + } + + string number_str = substring(input, 0, size(input)-1); + + if( findfirstnotof( number_str, "0123456789.") == nil ) + { + if( last_char == "k" || last_char == "K" ) + { + number = tointeger(tofloat( number_str ) * 1024.0) ; + } + else if ( last_char == "m" || last_char == "M" ) + { + number = tointeger(tofloat( number_str ) * 1024.0 * 1024.0); + } + else if ( last_char == "g" || last_char == "G" ) + { + number = tointeger(tofloat( number_str ) * + 1024.0 * 1024.0 * 1024.0); + } + else if ( last_char == "t" || last_char == "T" ) + { + number = tointeger(tofloat( number_str ) * + 1024.0 * 1024.0 * 1024.0 * 1024.0); + } + else + { + number = 0; + } + } + else + { + number = 0; + } + } + else if( size(input)==0 ) + { + number = 0; + } + else + { + number = tointeger( input ); + } + return( number ); }; -- 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] r49657 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: aschnell Date: Mon Aug 4 19:56:03 2008 New Revision: 49657 URL: http://svn.opensuse.org/viewcvs/yast?rev=49657&view=rev Log: - use humanStringToByte from libstorage for parsing config Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Aug 4 19:56:03 2008 @@ -170,7 +170,7 @@ boolean proposal_evms = false; boolean proposal_lvm = false; boolean proposal_home = false; -map cfg_xml = $[]; +map<string, any> cfg_xml = $[]; string part_insts = ""; @@ -6829,78 +6829,6 @@ return( ret ); }; -global integer KmgtStrToByte( string input ) - ``{ - integer number = 0; - integer pos = findfirstnotof( input, " +" ); - - if( pos != nil && pos>0 ) - { - input = substring( input, pos ); - } - - if( size(filterchars(input, "0123456789kKmMgGtTbBoO .")) != size(input)) - { - return(0); - } - - input = filterchars(input, "0123456789kKmMgGtTbBoO."); - - if( size(input)>0 && findfirstnotof( input, "0123456789.") != nil ) - { - // check whether the last char is in "kKmM" or "bB" - string last_char = substring( input, size(input)-1, 1); - - if( last_char == "b" || last_char == "B" || - last_char == "o" || last_char == "O" ) - { - input = substring( input, 0, size(input)-1); - // check whether the last char is in "kKmM" - last_char = substring( input, size(input)-1, 1); - } - - string number_str = substring(input, 0, size(input)-1); - - if( findfirstnotof( number_str, "0123456789.") == nil ) - { - if( last_char == "k" || last_char == "K" ) - { - number = tointeger(tofloat( number_str ) * 1024.0) ; - } - else if ( last_char == "m" || last_char == "M" ) - { - number = tointeger(tofloat( number_str ) * 1024.0 * 1024.0); - } - else if ( last_char == "g" || last_char == "G" ) - { - number = tointeger(tofloat( number_str ) * - 1024.0 * 1024.0 * 1024.0); - } - else if ( last_char == "t" || last_char == "T" ) - { - number = tointeger(tofloat( number_str ) * - 1024.0 * 1024.0 * 1024.0 * 1024.0); - } - else - { - number = 0; - } - } - else - { - number = 0; - } - } - else if( size(input)==0 ) - { - number = 0; - } - else - { - number = tointeger( input ); - } - return( number ); - }; global boolean InstallOES() { @@ -6971,61 +6899,71 @@ proposal_lvm, proposal_evms, proposal_home, home_only ); } -global map GetControlCfg() + +global map<string, any> GetControlCfg() +{ + integer StrToByte(string str) + { + integer bytes = 0; + if (!LibStorage::StorageInterface::humanStringToByte(sint, str, true, bytes)) + y2error("cannot parse %1", str); + return bytes; + } + + if (size(cfg_xml) == 0) { - if( size(cfg_xml)==0 ) - { boolean bt = ProductFeatures::GetBooleanFeature( "partitioning", "try_separate_home" ); cfg_xml["home"] = bt?true:false; + cfg_xml["root_percent"] = tointeger(ProductFeatures::GetStringFeature( "partitioning", "root_space_percent")); if( cfg_xml["root_percent"]:0 == nil || cfg_xml["root_percent"]:0 <= 0 ) cfg_xml["root_percent"] = 40; + string tmp = ProductFeatures::GetStringFeature( "partitioning", "limit_try_home"); - cfg_xml["home_limit"] = KmgtStrToByte(tmp) / (1024*1024); + cfg_xml["home_limit"] = StrToByte(tmp) / (1024*1024); if( cfg_xml["home_limit"]:0 <= 0 ) cfg_xml["home_limit"] = 5*1024; + tmp = ProductFeatures::GetStringFeature( "partitioning", "root_base_size"); - cfg_xml["root_base"] = KmgtStrToByte(tmp) / (1024*1024); + cfg_xml["root_base"] = StrToByte(tmp) / (1024*1024); if( cfg_xml["root_base"]:0 <= 0 ) cfg_xml["root_base"] = 3*1024; + tmp = ProductFeatures::GetStringFeature( "partitioning", "root_max_size"); - cfg_xml["root_max"] = KmgtStrToByte(tmp) / (1024*1024); + cfg_xml["root_max"] = StrToByte(tmp) / (1024*1024); if( cfg_xml["root_max"]:0 <= 0 ) cfg_xml["root_max"] = 10*1024; + tmp = ProductFeatures::GetStringFeature( "partitioning", "vm_desired_size"); - cfg_xml["vm_want"] = KmgtStrToByte(tmp) / (1024*1024); + cfg_xml["vm_want"] = StrToByte(tmp) / (1024*1024); if( cfg_xml["vm_want"]:0 <= 0 ) cfg_xml["vm_want"] = 15*1024; + tmp = ProductFeatures::GetStringFeature( "partitioning", "vm_home_max_size"); - cfg_xml["home_max"] = KmgtStrToByte(tmp) / (1024*1024); + cfg_xml["home_max"] = StrToByte(tmp) / (1024*1024); if( cfg_xml["home_max"]:0 <= 0 ) cfg_xml["home_max"] = 25*1024; - bt = ProductFeatures::GetBooleanFeature( "partitioning", - "proposal_evms" ); - cfg_xml["prop_evms"] = bt?true:false; + bt = ProductFeatures::GetBooleanFeature( "partitioning", "proposal_lvm" ); cfg_xml["prop_lvm"] = bt?true:false; - bt = ProductFeatures::GetBooleanFeature( "partitioning", - "evms_config" ); - cfg_xml["evms_config"] = bt?true:false; - bt = ProductFeatures::GetBooleanFeature( "partitioning", - "evms_boot" ); - cfg_xml["evms_boot"] = bt?true:false; + SetProposalDefault(false); - y2milestone( "GetControlCfg cfg_xml %1", cfg_xml ); - } - return( cfg_xml ); + y2milestone("GetControlCfg cfg_xml:%1", cfg_xml); } + return cfg_xml; +} + + global boolean BootEvms() { map cfg = GetControlCfg(); -- 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] r49656 - in /trunk/storage/libstorage/src: Dasd.cc Disk.cc Dm.cc DmCo.cc DmPartCo.cc DmraidCo.cc Loop.cc LoopCo.cc LvmVg.cc MdCo.cc Storage.cc StorageDefines.h Volume.cc
by aschnell＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: aschnell Date: Mon Aug 4 18:34:26 2008 New Revision: 49656 URL: http://svn.opensuse.org/viewcvs/yast?rev=49656&view=rev Log: - work on shell quoting and absolute path names for executables Modified: trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Dm.cc trunk/storage/libstorage/src/DmCo.cc trunk/storage/libstorage/src/DmPartCo.cc trunk/storage/libstorage/src/DmraidCo.cc trunk/storage/libstorage/src/Loop.cc trunk/storage/libstorage/src/LoopCo.cc trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/MdCo.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/StorageDefines.h trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Dasd.cc (original) +++ trunk/storage/libstorage/src/Dasd.cc Mon Aug 4 18:34:26 2008 @@ -35,7 +35,7 @@ bool Dasd::detectPartitionsFdasd( ProcPart& ppart ) { bool ret = true; - string cmd_line = "/sbin/fdasd -p " + device(); + string cmd_line = "/sbin/fdasd -p " + quote(device()); system_stderr.erase(); y2milestone( "executing cmd:%s", cmd_line.c_str() ); SystemCmd Cmd( cmd_line ); @@ -49,7 +49,7 @@ bool Dasd::detectPartitions( ProcPart& ppart ) { bool ret = true; - string cmd_line = "dasdview -x " + device(); + string cmd_line = "dasdview -x " + quote(device()); system_stderr.erase(); detected_label = "dasd"; setLabelData( "dasd" ); @@ -381,7 +381,7 @@ ++i; } inpfile.close(); - string cmd_line = "/sbin/fdasd -c " + inpname + " " + device(); + string cmd_line = "/sbin/fdasd -c " + inpname + " " + quote(device()); if( execCheckFailed( cmd_line ) ) { SystemCmd cmd( "cat " + inpname ); Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Mon Aug 4 18:34:26 2008 @@ -2285,7 +2285,7 @@ { string cmd; SystemCmd c; - cmd = "dd if=/dev/zero of=" + p->device() + " bs=1k count=200"; + cmd = "dd if=/dev/zero of=" + quote(p->device()) + " bs=1k count=200"; c.execute( cmd ); unsigned long long pos = p->sizeK(); if( pos>200 ) @@ -2307,7 +2307,7 @@ } if( !dmp_slave && call_blockdev ) { - SystemCmd c( "/sbin/blockdev --rereadpt " + device() ); + SystemCmd c("/sbin/blockdev --rereadpt " + quote(device())); if( p->type()!=EXTENDED ) getStorage()->waitForDevice( p->device() ); } Modified: trunk/storage/libstorage/src/Dm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.cc?rev… ============================================================================== --- trunk/storage/libstorage/src/Dm.cc (original) +++ trunk/storage/libstorage/src/Dm.cc Mon Aug 4 18:34:26 2008 @@ -10,6 +10,7 @@ #include "y2storage/AppUtil.h" #include "y2storage/Regex.h" #include "y2storage/Storage.h" +#include "y2storage/StorageDefines.h" using namespace storage; using namespace std; @@ -54,7 +55,7 @@ { if( dm_major==0 ) getDmMajor(); - SystemCmd c("dmsetup table " + quote(tname)); + SystemCmd c(DMSETUPBIN " table " + quote(tname)); inactiv = c.retcode()!=0; y2milestone( "table %s retcode:%d numLines:%u inactive:%d", tname.c_str(), c.retcode(), c.numLines(), inactiv ); @@ -196,8 +197,8 @@ ret = Loop::loopDeviceName(mi); if( ret.empty() && mj==dmMajor() && ls.size()>=2 ) { - c.execute( "dmsetup info -c --noheadings -j " + *ls.begin() + - " -m " + *(++ls.begin()) + " | sed -e \"s/:.*//\"" ); + c.execute(DMSETUPBIN " info -c --noheadings -j " + *ls.begin() + + " -m " + *(++ls.begin()) + " | sed -e \"s/:.*//\"" ); if( c.retcode()==0 && c.numLines()>0 ) { string tmp = "/dev/"+*c.getLine(0); @@ -207,7 +208,7 @@ } else { - c.execute("dmsetup table " + quote(*c.getLine(0))); + c.execute(DMSETUPBIN " table " + quote(*c.getLine(0))); if( c.retcode()==0 && c.numLines()>0 ) { pair = extractNthWord( 3, *c.getLine(0) ); @@ -436,7 +437,7 @@ SystemCmd c; if( val ) { - c.execute( "dmsetup version" ); + c.execute(DMSETUPBIN " version"); if( c.retcode()!=0 ) { c.execute(" grep \"^dm[-_]mod[ ]\" /proc/modules" ); @@ -450,7 +451,7 @@ } else { - c.execute( "dmsetup remove_all" ); + c.execute(DMSETUPBIN " remove_all"); } active = val; } @@ -489,7 +490,7 @@ int Dm::dmNumber( const string& table ) { int ret = -1; - SystemCmd c("dmsetup -c --noheadings info " + quote(table)); + SystemCmd c(DMSETUPBIN " -c --noheadings info " + quote(table)); if( c.retcode()==0 && c.numLines()>0 ) { list<string> sl = splitString( *c.getLine(0), ":" ); Modified: trunk/storage/libstorage/src/DmCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/DmCo.cc (original) +++ trunk/storage/libstorage/src/DmCo.cc Mon Aug 4 18:34:26 2008 @@ -11,6 +11,7 @@ #include "y2storage/ProcPart.h" #include "y2storage/AppUtil.h" #include "y2storage/Storage.h" +#include "y2storage/StorageDefines.h" using namespace std; using namespace storage; @@ -77,7 +78,7 @@ if( dev.substr( 0, 12 ) == "/dev/mapper/") { string tdev = dev.substr (12); - SystemCmd c("cryptsetup status " + quote(tdev)); + SystemCmd c(CRYPTSETUPBIN " status " + quote(tdev)); string cipher, keysize; for( unsigned int i = 0; i < c.numLines(); i++) @@ -113,7 +114,7 @@ Storage::ConstDmraidCoPair dmrco = getStorage()->dmraidCoPair(); Storage::ConstDmraidPair dmr = getStorage()->dmrPair(); y2milestone( "begin" ); - SystemCmd c( "dmsetup ls | grep \"(.*)\"" ); + SystemCmd c(DMSETUPBIN " ls | grep \"(.*)\"" ); for( unsigned i=0; i<c.numLines(); ++i ) { string line = *c.getLine(i); @@ -318,7 +319,7 @@ ret = m->prepareRemove(); if( ret==0 ) { - string cmd = "dmsetup remove " + m->getTableName(); + string cmd = DMSETUPBIN " remove " + quote(m->getTableName()); SystemCmd c( cmd ); if( c.retcode()!=0 ) ret = DM_REMOVE_FAILED; Modified: trunk/storage/libstorage/src/DmPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.… ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.cc (original) +++ trunk/storage/libstorage/src/DmPartCo.cc Mon Aug 4 18:34:26 2008 @@ -12,6 +12,7 @@ #include "y2storage/SystemCmd.h" #include "y2storage/AppUtil.h" #include "y2storage/Storage.h" +#include "y2storage/StorageDefines.h" using namespace std; using namespace storage; @@ -232,7 +233,7 @@ void DmPartCo::init( ProcPart& ppart ) { - SystemCmd c("dmsetup table " + quote(nm)); + SystemCmd c(DMSETUPBIN " table " + quote(nm)); if( c.retcode()==0 && c.numLines()>=1 && isdigit( c.stdout()[0] )) { mnr = Dm::dmNumber( nm ); @@ -249,7 +250,7 @@ { string pat = numToName(1); pat.erase( pat.length()-1, 1 ); - c.execute( "dmsetup ls | grep -w ^" + pat + "[0-9]\\\\+" ); + c.execute(DMSETUPBIN " ls | grep -w ^" + pat + "[0-9]\\\\+" ); if( c.numLines()==0 ) activate_part(true); } @@ -499,11 +500,11 @@ if( val ) { Dm::activate(true); - c.execute( "kpartx -a -p _part \"" + dev + "\"" ); + c.execute(KPARTXBIN " -a -p _part " + quote(dev)); } else { - c.execute( "kpartx -d -p _part \"" + dev + "\"" ); + c.execute(KPARTXBIN " -d -p _part " + quote(dev)); } active = val; } Modified: trunk/storage/libstorage/src/DmraidCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmraidCo.… ============================================================================== --- trunk/storage/libstorage/src/DmraidCo.cc (original) +++ trunk/storage/libstorage/src/DmraidCo.cc Mon Aug 4 18:34:26 2008 @@ -30,7 +30,7 @@ void DmraidCo::getRaidData( const string& name ) { y2milestone( "name:%s", name.c_str() ); - SystemCmd c( "dmraid -s -c -c -c \"" + name + "\"" ); + SystemCmd c( "dmraid -s -c -c -c " + quote(name)); list<string>::const_iterator ci; list<string> sl; if( c.numLines()>0 ) Modified: trunk/storage/libstorage/src/Loop.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Loop.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Loop.cc (original) +++ trunk/storage/libstorage/src/Loop.cc Mon Aug 4 18:34:26 2008 @@ -182,7 +182,7 @@ y2mil( "pa:" << pa ); createPath( pa ); } - string cmd = "dd if=/dev/zero of=" + lfileRealPath(); + string cmd = "dd if=/dev/zero of=" + quote(lfileRealPath()); cmd += " bs=1k count=" + decString( sizeK() ); SystemCmd c( cmd ); ret = c.retcode()==0; Modified: trunk/storage/libstorage/src/LoopCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LoopCo.cc… ============================================================================== --- trunk/storage/libstorage/src/LoopCo.cc (original) +++ trunk/storage/libstorage/src/LoopCo.cc Mon Aug 4 18:34:26 2008 @@ -13,6 +13,7 @@ #include "y2storage/AppUtil.h" #include "y2storage/Storage.h" #include "y2storage/EtcFstab.h" +#include "y2storage/StorageDefines.h" using namespace storage; using namespace std; @@ -53,7 +54,7 @@ fstab->getFileBasedLoops( getStorage()->root(), l ); if( !l.empty() ) { - SystemCmd c( "losetup -a" ); + SystemCmd c(LOSETUPBIN " -a"); for( list<FstabEntry>::const_iterator i=l.begin(); i!=l.end(); ++i ) { y2mil( "i:" << *i ); Modified: trunk/storage/libstorage/src/LvmVg.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.cc?… ============================================================================== --- trunk/storage/libstorage/src/LvmVg.cc (original) +++ trunk/storage/libstorage/src/LvmVg.cc Mon Aug 4 18:34:26 2008 @@ -497,7 +497,7 @@ void LvmVg::getVgData( const string& name, bool exists ) { y2milestone( "name:%s", name.c_str() ); - SystemCmd c(VGDISPLAYBIN " --units k -v " + name); + SystemCmd c(VGDISPLAYBIN " --units k -v " + quote(name)); unsigned cnt = c.numLines(); unsigned i = 0; num_lv = 0; @@ -1010,7 +1010,7 @@ rmdir( ddir.c_str() ); } string cmd = VGCREATEBIN " " + instSysString() + metaString() + - "-s " + decString(pe_size) + "k " + name() + " " + devices; + "-s " + decString(pe_size) + "k " + quote(name()) + " " + quote(devices); SystemCmd c( cmd ); if( c.retcode()!=0 ) { @@ -1088,7 +1088,7 @@ ret = doCreatePv( *d ); if( ret==0 ) { - string cmd = "vgextend " + instSysString() + name() + " " + *d; + string cmd = VGEXTENDBIN " " + instSysString() + quote(name()) + " " + quote(*d); SystemCmd c( cmd ); if( c.retcode()!=0 ) { @@ -1137,7 +1137,7 @@ { getStorage()->showInfoCb( reduceVgText(true,*d) ); } - string cmd = "vgreduce " + instSysString() + name() + " " + *d; + string cmd = VGREDUCEBIN " " + instSysString() + quote(name()) + " " + quote(*d); SystemCmd c( cmd ); if( c.retcode()!=0 ) { @@ -1183,8 +1183,8 @@ if( l->stripeSize()>0 ) cmd += " -I " + decString(l->stripeSize()); } - cmd += " -n " + l->name(); - cmd += " " + name(); + cmd += " -n " + quote(l->name()); + cmd += " " + quote(name()); SystemCmd c( cmd ); if( c.retcode()!=0 ) { @@ -1224,7 +1224,7 @@ ret = v->prepareRemove(); if( ret==0 ) { - string cmd = LVREMOVEBIN " -f " + instSysString() + " " + l->device(); + string cmd = LVREMOVEBIN " -f " + instSysString() + " " + quote(l->device()); SystemCmd c( cmd ); if( c.retcode()!=0 ) { @@ -1280,8 +1280,8 @@ ret = v->resizeFs(); if( ret==0 && old_le>new_le ) { - string cmd = "lvreduce -f " + instSysString() + - " -l -" + decString(old_le-new_le) + " " + l->device(); + string cmd = LVREDUCEBIN " -f " + instSysString() + + " -l -" + decString(old_le-new_le) + " " + quote(l->device()); SystemCmd c( cmd ); if( c.retcode()!=0 ) { @@ -1291,8 +1291,8 @@ } if( ret==0 && old_le<new_le ) { - string cmd = "lvextend " + instSysString() + - " -l +" + decString(new_le-old_le) + " " + l->device(); + string cmd = LVEXTENDBIN " " + instSysString() + + " -l +" + decString(new_le-old_le) + " " + quote(l->device()); SystemCmd c( cmd ); if( c.retcode()!=0 ) { Modified: trunk/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/MdCo.cc (original) +++ trunk/storage/libstorage/src/MdCo.cc Mon Aug 4 18:34:26 2008 @@ -11,6 +11,7 @@ #include "y2storage/AppUtil.h" #include "y2storage/Storage.h" #include "y2storage/EtcRaidtab.h" +#include "y2storage/StorageDefines.h" using namespace std; using namespace storage; @@ -571,14 +572,14 @@ string mdconf = tmpDir + "/mdadm.conf"; string cmd = "echo 1 > /sys/module/md_mod/parameters/start_ro"; c.execute( cmd ); - cmd = "mdadm --examine --scan --config=partitions >" + mdconf; + cmd = MDADMBIN " --examine --scan --config=partitions >" + mdconf; c.execute( cmd ); - cmd = "mdadm --assemble --scan --config=" + mdconf; + cmd = MDADMBIN " --assemble --scan --config=" + mdconf; c.execute( cmd ); } else { - c.execute( "mdadm --stop --scan" ); + c.execute(MDADMBIN " --stop --scan"); } active = val; } @@ -629,9 +630,9 @@ { string cmd; SystemCmd c; - cmd = "dd if=/dev/zero of=" + m->device() + " bs=1k count=200"; + cmd = "dd if=/dev/zero of=" + quote(m->device()) + " bs=1k count=200"; c.execute( cmd ); - cmd = "dd if=/dev/zero of=" + m->device() + + cmd = "dd if=/dev/zero of=" + quote(m->device()) + " seek=" + decString(m->sizeK()-10) + " bs=1k count=10"; c.execute( cmd ); @@ -661,7 +662,7 @@ ret = m->prepareRemove(); if( ret==0 ) { - string cmd = "mdadm --stop " + m->device(); + string cmd = MDADMBIN " --stop " + quote(m->device()); SystemCmd c( cmd ); if( c.retcode()!=0 ) { @@ -676,7 +677,7 @@ m->getDevs( d ); for( list<string>::const_iterator i=d.begin(); i!=d.end(); ++i ) { - c.execute( "mdadm --zero-superblock " + *i ); + c.execute(MDADMBIN " --zero-superblock " + quote(*i)); } } if( ret==0 ) Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Mon Aug 4 18:34:26 2008 @@ -37,6 +37,7 @@ #include "y2storage/ProcPart.h" #include "y2storage/EtcFstab.h" #include "y2storage/AsciiFile.h" +#include "y2storage/StorageDefines.h" using namespace std; using namespace storage; @@ -286,7 +287,7 @@ SystemCmd rm; for( unsigned i=0; i<c.numLines(); i++ ) { - rm.execute( "mdadm --stop /dev/" + extractNthWord(0, *c.getLine(i)) ); + rm.execute(MDADMBIN " --stop " + quote("/dev/" + extractNthWord(0, *c.getLine(i)))); } } delete ppart; @@ -421,14 +422,14 @@ void Storage::detectMultipath() { - bool acc_ok = access( "/sbin/multipath", X_OK )==0; + bool acc_ok = access(MULTIPATHBIN, X_OK) == 0; y2mil( "detectMultipath acc_ok:" << acc_ok ); if( acc_ok ) { list<string> mp_list; string line; unsigned i=0; - SystemCmd c( "/sbin/multipath -d -v 2+ -ll" ); + SystemCmd c(MULTIPATHBIN " -d -v 2+ -ll"); if( i<c.numLines() ) line = *c.getLine(i); while( i<c.numLines() ) @@ -855,7 +856,7 @@ { y2milestone( "detectFsData begin" ); SystemCmd Blkid( "BLKID_SKIP_CHECK_MDRAID=1 /sbin/blkid -c /dev/null" ); - SystemCmd Losetup( "/sbin/losetup -a" ); + SystemCmd Losetup(LOSETUPBIN " -a"); for( VolIterator i=begin; i!=end; ++i ) { if( i->getUsedByType()==UB_NONE ) @@ -4343,9 +4344,9 @@ if( !todo.empty() ) { SystemCmd c; - c.execute( "dmsetup ls" ); - c.execute( "dmsetup table" ); - c.execute( "dmsetup info" ); + c.execute(DMSETUPBIN " ls"); + c.execute(DMSETUPBIN " table"); + c.execute(DMSETUPBIN " info"); logProcData(); } } @@ -4437,7 +4438,7 @@ } tfile.close(); c.execute( "cat " + fname ); - c.execute("dmsetup create " + quote(tblname) + " <" + fname); + c.execute(DMSETUPBIN " create " + quote(tblname) + " <" + fname); unlink( fname.c_str() ); } EvmsCo::activateDevices(); @@ -5278,7 +5279,7 @@ removeDmMapsTo( vol.getContainer()->device() ); if( vol.getContainer()->majorNr()>0 ) { - string cmd = "dmsetup table | grep -w "; + string cmd = DMSETUPBIN " table | grep -w "; cmd += decString(vol.getContainer()->majorNr()) + ":" + decString(vol.getContainer()->minorNr()); cmd += " | sed s/:.*// | uniq"; @@ -5304,15 +5305,15 @@ bool Storage::removeDmTable( const string& table ) { - SystemCmd c("dmsetup table " + quote(table)); + SystemCmd c(DMSETUPBIN " table " + quote(table)); bool ret = false; if( c.retcode()==0 ) { - c.execute("dmsetup info " + quote(table)); - c.execute("dmsetup remove " + quote(table)); + c.execute(DMSETUPBIN " info " + quote(table)); + c.execute(DMSETUPBIN " remove " + quote(table)); waitForDevice(); ret = c.retcode()==0; - c.execute("dmsetup table | grep " + quote(table)); + c.execute(DMSETUPBIN " table | grep " + quote(table)); logProcData(); } y2milestone( "ret:%d", ret ); @@ -6151,7 +6152,7 @@ } if( ret && vol->getFs()==NTFS ) { - SystemCmd c( "ntfsresize -f -i " + device ); + SystemCmd c( "ntfsresize -f -i " + quote(device)); string fstr = " might resize at "; string::size_type pos; if( c.retcode()==0 && Modified: trunk/storage/libstorage/src/StorageDefines.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageDe… ============================================================================== --- trunk/storage/libstorage/src/StorageDefines.h (original) +++ trunk/storage/libstorage/src/StorageDefines.h Mon Aug 4 18:34:26 2008 @@ -11,10 +11,20 @@ #define LVCREATEBIN "/sbin/lvcreate" #define LVREMOVEBIN "/sbin/lvremove" +#define LVEXTENDBIN "/sbin/lvextend" +#define LVREDUCEBIN "/sbin/lvreduce" #define VGCREATEBIN "/sbin/vgcreate" #define VGREMOVEBIN "/sbin/vgremove" +#define VGEXTENDBIN "/sbin/vgextend" +#define VGREDUCEBIN "/sbin/vgreduce" #define VGDISPLAYBIN "/sbin/vgdisplay" +#define CRYPTSETUPBIN "/sbin/cryptsetup" +#define LOSETUPBIN "/sbin/losetup" +#define MULTIPATHBIN "/sbin/multipath" +#define DMSETUPBIN "/sbin/dmsetup" +#define KPARTXBIN "/sbin/kpartx" + #endif Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Mon Aug 4 18:34:26 2008 @@ -19,6 +19,7 @@ #include "y2storage/ProcPart.h" #include "y2storage/OutputProcessor.h" #include "y2storage/EtcFstab.h" +#include "y2storage/StorageDefines.h" using namespace std; using namespace storage; @@ -692,7 +693,7 @@ SystemCmd c; string cmd = "/bin/dd if="; cmd += (encryption!=ENC_NONE) ? "/dev/urandom" : "/dev/zero"; - cmd += " of=" + mountDevice() + " bs=1024 count="; + cmd += " of=" + quote(mountDevice()) + " bs=1024 count="; cmd += decString(min(200ull,size_k)); if( c.execute( cmd ) != 0 ) ret = VOLUME_FORMAT_DD_FAILED; @@ -720,7 +721,7 @@ mountDevice().find( "/dev/loop" )!=0 ) { SystemCmd c; - c.execute( "mdadm --zero-superblock " + mountDevice() ); + c.execute(MDADMBIN " --zero-superblock " + quote(mountDevice())); } if( ret==0 ) { @@ -802,7 +803,7 @@ { if (!tunefs_opt.empty()) { - string cmd = "/sbin/tune2fs " + tunefs_opt + " " + mountDevice(); + string cmd = "/sbin/tune2fs " + tunefs_opt + " " + quote(mountDevice()); SystemCmd c( cmd ); if( c.retcode()!=0 ) ret = VOLUME_TUNE2FS_FAILED; @@ -826,7 +827,7 @@ { if (!tunefs_opt.empty()) { - string cmd = "/sbin/reiserfstune " + tunefs_opt + " " + mountDevice(); + string cmd = "/sbin/reiserfstune " + tunefs_opt + " " + quote(mountDevice()); SystemCmd c( cmd ); if( c.retcode()!=0 ) ret = VOLUME_TUNE2FS_FAILED; @@ -872,7 +873,7 @@ void Volume::updateFsData() { - SystemCmd Blkid( "BLKID_SKIP_CHECK_MDRAID=1 /sbin/blkid -c /dev/null " + mountDevice() ); + SystemCmd Blkid("BLKID_SKIP_CHECK_MDRAID=1 /sbin/blkid -c /dev/null " + quote(mountDevice())); getFsData( Blkid ); } @@ -962,7 +963,7 @@ { if( !loop_dev.empty() ) { - SystemCmd c( "losetup -d " + loop_dev ); + SystemCmd c(LOSETUPBIN " -d " + quote(loop_dev)); if( c.retcode()!=0 ) ret = VOLUME_LOUNSETUP_FAILED; else @@ -987,7 +988,7 @@ table.erase( 0, table.find_last_of( '/' )+1 ); if( !table.empty() ) { - SystemCmd c("cryptsetup remove " + quote(table)); + SystemCmd c(CRYPTSETUPBIN " remove " + quote(table)); if( c.retcode()!=0 ) ret = VOLUME_CRYPTUNSETUP_FAILED; else @@ -1191,7 +1192,7 @@ int ret = 0; if( encryption!=ENC_NONE && !dmcrypt_dev.empty() ) { - cmd = "cryptsetup resize "; + cmd = CRYPTSETUPBIN " resize "; cmd += dmcrypt_dev.substr(dmcrypt_dev.rfind( '/' )+1); c.execute( cmd ); } @@ -1460,7 +1461,7 @@ int ret = 0; if( loop_dev.empty() ) { - SystemCmd c( "losetup -a" ); + SystemCmd c(LOSETUPBIN " -a" ); ret = getFreeLoop( c ); } y2milestone( "ret:%d", ret ); @@ -1469,10 +1470,7 @@ string Volume::getLosetupCmd( storage::EncryptType, const string& pwdfile ) const { - string cmd = "/sbin/losetup"; - cmd += " "; - cmd += loop_dev; - cmd += " "; + string cmd = LOSETUPBIN " " + quote(loop_dev) + " "; const Loop* l = static_cast<const Loop*>(this); cmd += l->lfileRealPath(); y2milestone( "cmd:%s", cmd.c_str() ); @@ -1488,7 +1486,7 @@ " format:" << format << " pwempty:" << empty_pwd ); if( table.find( '/' )!=string::npos ) table.erase( 0, table.find_last_of( '/' )+1 ); - string cmd = "/sbin/cryptsetup -q"; + string cmd = CRYPTSETUPBIN " -q"; if( format ) { @@ -1667,8 +1665,8 @@ { string lfile; if( getLoopFile( lfile )) - c.execute( "losetup " + loop_dev + " " + - cont->getStorage()->root() + lfile ); + c.execute(LOSETUPBIN " " + quote(loop_dev) + " " + + quote(cont->getStorage()->root() + lfile)); } string cmd = getCryptsetupCmd( try_order[pos], dmcrypt_dev, "", fname, false ); c.execute( "modprobe dm-crypt" ); @@ -1799,7 +1797,7 @@ { if( loop_dev.size()>0 ) { - SystemCmd c( "losetup -d " + loop_dev ); + SystemCmd c(LOSETUPBIN " -d " + quote(loop_dev)); loop_dev.erase(); } updateFstabOptions(); -- 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] r49655 - in /trunk/gtk: ChangeLog src/YGUI.cc src/YGUtils.cc src/YGUtils.h src/ygtkrichtext.c src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: rpmcruz Date: Mon Aug 4 18:14:13 2008 New Revision: 49655 URL: http://svn.opensuse.org/viewcvs/yast?rev=49655&view=rev Log: * src/YGUtils.cc: convert_to_xhtml() bug fix: allow '=' to be used inside quoted tag arguments. * src/yzyppwrapper.cc: show bugzilla entries in patch description. * src/yzyppwrapper.cc: don't show satisfied candidates if the package is not installed. And don't show broken installed packages if there is no candidate to be found. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGUI.cc trunk/gtk/src/YGUtils.cc trunk/gtk/src/YGUtils.h trunk/gtk/src/ygtkrichtext.c trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=49655&r1=49654… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Mon Aug 4 18:14:13 2008 @@ -1,3 +1,14 @@ +2008-08-04 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGUtils.cc: convert_to_xhtml() bug fix: allow '=' to be used + inside quoted tag arguments. + + * src/yzyppwrapper.cc: show bugzilla entries in patch description. + + * src/yzyppwrapper.cc: don't show satisfied candidates if the package + is not installed. And don't show broken installed packages if there is + no candidate to be found. + 2008-08-03 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/yzyppwrapper.cc: translate patch severities. Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=49655&r1=496… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Mon Aug 4 18:14:13 2008 @@ -757,7 +757,7 @@ YRichText *rtext = dynamic_cast <YRichText *> (widget); if (rtext) { std::string text = rtext->text(); - char *xml = ygutils_convert_to_xhmlt_and_subst (text.c_str()); + char *xml = ygutils_convert_to_xhtml (text.c_str()); GtkWidget *view = gtk_text_view_new(); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD); Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=49655&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Mon Aug 4 18:14:13 2008 @@ -256,7 +256,7 @@ // We have to: // + rewrite and <hr> tags // + deal with <a attrib=noquotes> -gchar *ygutils_convert_to_xhmlt_and_subst (const char *instr) +gchar *ygutils_convert_to_xhtml (const char *instr) { GString *outp = g_string_new (""); GQueue *tag_queue = g_queue_new(); @@ -324,11 +324,19 @@ // Add quoting for un-quoted attributes for (int j = 0; j < (signed) tag->len; j++) { if (tag->str[j] == '=') { - if (tag->str[j+1] != '"') { + gboolean unquote = tag->str[j+1] != '"'; + if (unquote) g_string_insert_c (tag, j+1, '"'); - for (j++; !g_ascii_isspace (tag->str[j]) && tag->str[j]; j++) ; - g_string_insert_c (tag, j, '"'); + else + j++; + for (j++; tag->str[j]; j++) { + if (unquote && g_ascii_isspace (tag->str[j])) + break; + else if (!unquote && tag->str[j] == '"') + break; } + if (unquote) + g_string_insert_c (tag, j, '"'); } } Modified: trunk/gtk/src/YGUtils.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.h?rev=49655&r1=4… ============================================================================== --- trunk/gtk/src/YGUtils.h (original) +++ trunk/gtk/src/YGUtils.h Mon Aug 4 18:14:13 2008 @@ -59,7 +59,7 @@ void ygutils_scrollView (GtkTextView *view, gboolean top); /* Convert html to xhtml (or at least try) */ - gchar *ygutils_convert_to_xhmlt_and_subst (const char *instr); + gchar *ygutils_convert_to_xhtml (const char *instr); void ygutils_setStockIcon (GtkWidget *button, const char *ycp_str); }; Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=49655… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Mon Aug 4 18:14:13 2008 @@ -17,7 +17,7 @@ // Sucky - but we mix C & C++ so ... /* Convert html to xhtml (or at least try) */ -gchar *ygutils_convert_to_xhmlt_and_subst (const char *instr); +gchar *ygutils_convert_to_xhtml (const char *instr); G_DEFINE_TYPE (YGtkRichText, ygtk_rich_text, GTK_TYPE_TEXT_VIEW) @@ -554,7 +554,7 @@ GMarkupParseContext *ctx; ctx = g_markup_parse_context_new (&rt_parser, (GMarkupParseFlags)0, &state, NULL); - char *xml = ygutils_convert_to_xhmlt_and_subst (text); + char *xml = ygutils_convert_to_xhtml (text); GError *error = NULL; if (!g_markup_parse_context_parse (ctx, xml, -1, &error)) { #ifdef PRINT_WARNINGS Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=4965… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Mon Aug 4 18:14:13 2008 @@ -334,6 +334,13 @@ ZyppPatch patch = tryCastToZyppPatch (object); if (patch->rebootSuggested()) text += br + br + "" + _("Reboot needed!") + ""; + if (patch->referencesBegin() != patch->referencesEnd()) { + text += br + br + "Bugzilla:<ul>"; + for (zypp::Patch::ReferenceIterator it = patch->referencesBegin(); + it != patch->referencesEnd(); it++) + text += "<li><a href=\"" + it.href() + "\">" + it.title() + "</a></li>"; + text += "</ul>"; + } break; } case PATTERN_TYPE: @@ -579,12 +586,9 @@ bool Ypp::Package::isInstalled() { - if (!impl->zyppSel->installedEmpty()) { - if (impl->zyppSel->installedObj().isBroken()) - return false; - return true; - } - return impl->zyppSel->candidateObj().isSatisfied(); + if (!impl->zyppSel->installedEmpty()) + return !impl->zyppSel->installedObj().isBroken(); + return false; } bool Ypp::Package::hasUpgrade() @@ -783,8 +787,8 @@ { if (!impl->installedVersion) { const ZyppObject installedObj = impl->zyppSel->installedObj(); - if (installedObj) - impl->installedVersion = constructVersion (installedObj); + assert (installedObj != NULL); + impl->installedVersion = constructVersion (installedObj); } return impl->installedVersion; } @@ -1759,7 +1763,17 @@ } for (; it != end; it++) { Ypp::Node *category = 0, *category2 = 0; - ZyppObject object = (*it)->theObj(); + ZyppSelectable sel = *it; + ZyppObject object = sel->theObj(); + + // don't show if installed broken and there is no available + if (!sel->candidateObj()) { + if (!sel->installedEmpty() && sel->installedObj().isBroken()) + continue; + } + else if (sel->installedEmpty() && sel->candidateObj().isSatisfied()) + continue; + // add category and test visibility switch (type) { case Package::PACKAGE_TYPE: @@ -1784,7 +1798,7 @@ ZyppPatch patch = tryCastToZyppPatch (object); if (!patch) continue; - if ((*it)->candidateObj() && !(*it)->candidateObj().isRelevant()) + if (sel->candidateObj() && !sel->candidateObj().isRelevant()) continue; category = addCategory (type, patch->category()); break; @@ -1793,7 +1807,7 @@ break; } - Package *package = new Package (new Package::Impl (type, *it, category, category2)); + Package *package = new Package (new Package::Impl (type, sel, category, category2)); pool = g_slist_prepend (pool, package); } // its faster to prepend then reverse, as we avoid iterating for each append -- 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] r49654 - in /trunk/ncurses-pkg/src: NCPackageSelector.cc NCPackageSelector.h NCPkgMenuHelp.cc NCPkgMenuHelp.h NCPkgStrings.cc
by kmachalkova＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: kmachalkova Date: Mon Aug 4 17:53:55 2008 New Revision: 49654 URL: http://svn.opensuse.org/viewcvs/yast?rev=49654&view=rev Log: code cleanup: YOU help is treated just like any other help (via NCPkgMenuHelp class), no need for extra handler Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPkgMenuHelp.cc trunk/ncurses-pkg/src/NCPkgMenuHelp.h trunk/ncurses-pkg/src/NCPkgStrings.cc Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Mon Aug 4 17:53:55 2008 @@ -95,7 +95,6 @@ , viewMenu( 0 ) , extrasMenu( 0 ) , helpMenu( 0 ) - , youHelpButton( 0 ) , filterMain( 0 ) , actionMenu( 0 ) , filterMenu( 0 ) @@ -233,8 +232,6 @@ retVal = OkButtonHandler( event ); else if ( event.widget == cancelButton ) retVal = CancelHandler( event ); - else if ( event.widget == youHelpButton ) - retVal = YouHelpHandler( event ); else if ( event.widget == filterPopup ) { retVal = filterPopup->handleEvent(); @@ -977,39 +974,6 @@ /////////////////////////////////////////////////////////////////// // -// YOUHelpHandler -// -// Show the Online Update Help -// -bool NCPackageSelector::YouHelpHandler( const NCursesEvent& event ) -{ - NCPkgTable * packageList = PackageList(); - string text = ""; - - text += NCPkgStrings::YouHelp1(); - text += NCPkgStrings::YouHelp2(); - text += NCPkgStrings::YouHelp3(); - - // open the popup with the help text - NCPopupInfo * youHelp = new NCPopupInfo( wpos( (NCurses::lines()*8)/100, (NCurses::cols())*18/100 ), - NCPkgStrings::YouHelp(), - text - ); - youHelp->setPreferredSize( (NCurses::cols()*65)/100, (NCurses::lines()*85)/100 ); - youHelp->showInfoPopup( ); - - YDialog::deleteTopmostDialog(); - - if ( packageList ) - { - packageList->setKeyboardFocus(); - } - - return true; -} - -/////////////////////////////////////////////////////////////////// -// // CancelHandler // // Cancel button handler. @@ -1567,9 +1531,7 @@ YLayoutBox * bottom_bar = YUI::widgetFactory()->createHBox( vSplit ); YAlignment *ll = YUI::widgetFactory()->createLeft( bottom_bar ); - youHelpButton = new NCPushButton ( ll, _("&Help")); - YUI_CHECK_NEW( youHelpButton ); - youHelpButton->setFunctionKey( 1 ); + helpMenu = new NCPkgMenuHelp (ll, _("&Help"), this); YAlignment *r = YUI::widgetFactory()->createRight( bottom_bar ); YLayoutBox * hSplit5 = YUI::widgetFactory()->createHBox( r ); @@ -1667,7 +1629,7 @@ //Bottom button bar YAlignment *ll = YUI::widgetFactory()->createLeft( bottom_bar ); - helpMenu = new NCPkgMenuHelp (ll, _("&Help")); + helpMenu = new NCPkgMenuHelp (ll, _("&Help"), this); YUI_CHECK_NEW( helpMenu ); //right-alignment for OK-Cancel Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Mon Aug 4 17:53:55 2008 @@ -128,7 +128,6 @@ NCPkgMenuView *viewMenu; NCPkgMenuExtras *extrasMenu; NCPkgMenuHelp *helpMenu; - NCPushButton *youHelpButton; NCPkgFilterMain *filterMain; NCPkgMenuAction *actionMenu; NCPkgMenuFilter *filterMenu; @@ -327,13 +326,6 @@ */ bool CancelHandler ( const NCursesEvent& event ); - /** - * Handler function for the "Help" button in YOU - * @param event The Ncurses event - * @return bool - */ - bool YouHelpHandler( const NCursesEvent& event ); - /** * Handles hyperlinks in package description * @param link The link Modified: trunk/ncurses-pkg/src/NCPkgMenuHelp.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuHelp.cc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuHelp.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuHelp.cc Mon Aug 4 17:53:55 2008 @@ -20,14 +20,16 @@ #include "NCPkgMenuHelp.h" #include "NCPkgStrings.h" +#include "NCPackageSelector.h" /* Textdomain "ncurses-pkg" */ -NCPkgMenuHelp::NCPkgMenuHelp (YWidget *parent, string label) +NCPkgMenuHelp::NCPkgMenuHelp (YWidget *parent, string label, NCPackageSelector *pkger) : NCMenuButton( parent, label) + , pkg( pkger) { createLayout(); setFunctionKey( 1 ); @@ -40,17 +42,24 @@ void NCPkgMenuHelp::createLayout() { - generalHelp = new YMenuItem( _("&General Help") ); - items.push_back( generalHelp ); + if ( !pkg->isYouMode()) + { + generalHelp = new YMenuItem( _("&General Help") ); + items.push_back( generalHelp ); - statusHelp = new YMenuItem( _("&Package Status and Symbols") ); - items.push_back( statusHelp ); + statusHelp = new YMenuItem( _("&Package Status and Symbols") ); + items.push_back( statusHelp ); - filterHelp = new YMenuItem( _("&How To Use the Filters") ); - items.push_back( filterHelp ); + filterHelp = new YMenuItem( _("&How To Use the Filters") ); + items.push_back( filterHelp ); - menuHelp = new YMenuItem( _("&Useful Functions in Menu") ); - items.push_back( menuHelp ); + menuHelp = new YMenuItem( _("&Useful Functions in Menu") ); + items.push_back( menuHelp ); + } + else { + patchHelp = new YMenuItem( _("&Patch Status and Patch Installation")); + items.push_back ( patchHelp ); + } addItems( items); } @@ -100,6 +109,13 @@ text += NCPkgStrings::HelpOnFilters4(); text += NCPkgStrings::HelpOnFilters5(); } + else if ( event.selection == patchHelp ) + { + headline = NCPkgStrings::YouHelp(); + text += NCPkgStrings::YouHelp1(); + text += NCPkgStrings::YouHelp2(); + text += NCPkgStrings::YouHelp3(); + } else yuiError() << "zatim nic" << endl; Modified: trunk/ncurses-pkg/src/NCPkgMenuHelp.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuHelp.h?… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuHelp.h (original) +++ trunk/ncurses-pkg/src/NCPkgMenuHelp.h Mon Aug 4 17:53:55 2008 @@ -26,12 +26,15 @@ #include "NCPopupInfo.h" #include "NCZypp.h" +class NCPackageSelector; + class NCPkgMenuHelp : public NCMenuButton { NCPkgMenuHelp & operator=( const NCPkgMenuHelp & ); NCPkgMenuHelp ( const NCPkgMenuHelp & ); public: + NCPackageSelector *pkg; YItemCollection items; @@ -39,8 +42,9 @@ YMenuItem *statusHelp; YMenuItem *filterHelp; YMenuItem *menuHelp; + YMenuItem *patchHelp; - NCPkgMenuHelp (YWidget *parent, string label); + NCPkgMenuHelp (YWidget *parent, string label, NCPackageSelector *pkger); virtual ~NCPkgMenuHelp(); void createLayout(); Modified: trunk/ncurses-pkg/src/NCPkgStrings.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgStrings.cc?… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgStrings.cc (original) +++ trunk/ncurses-pkg/src/NCPkgStrings.cc Mon Aug 4 17:53:55 2008 @@ -564,7 +564,7 @@ const string NCPkgStrings::YouHelp() { // the headline of the help popup - static const string value = _( "Online Update Help" ); + static const string value = _( "Patch Status and Patch Installation" ); return value; } -- 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] r49653 - /tags/stable-2_17_0/heartbeat/
by kmachalkova＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: kmachalkova Date: Mon Aug 4 16:31:59 2008 New Revision: 49653 URL: http://svn.opensuse.org/viewcvs/yast?rev=49653&view=rev Log: Created tag stable-2_17_0 for heartbeat Added: tags/stable-2_17_0/heartbeat/ - copied from r49652, trunk/heartbeat/ -- 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] r49652 - in /trunk/heartbeat: VERSION package/yast2-heartbeat.changes
by kmachalkova＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: kmachalkova Date: Mon Aug 4 16:31:53 2008 New Revision: 49652 URL: http://svn.opensuse.org/viewcvs/yast?rev=49652&view=rev Log: version 2.17.0 Modified: trunk/heartbeat/VERSION trunk/heartbeat/package/yast2-heartbeat.changes Modified: trunk/heartbeat/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/VERSION?rev=49652&r1=4… ============================================================================== --- trunk/heartbeat/VERSION (original) +++ trunk/heartbeat/VERSION Mon Aug 4 16:31:53 2008 @@ -1 +1 @@ -2.16.2 +2.17.0 Modified: trunk/heartbeat/package/yast2-heartbeat.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/package/yast2-heartbea… ============================================================================== --- trunk/heartbeat/package/yast2-heartbeat.changes (original) +++ trunk/heartbeat/package/yast2-heartbeat.changes Mon Aug 4 16:31:53 2008 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Mon Aug 4 16:26:06 CEST 2008 - kmachalkova(a)suse.cz + +- Replaced deprecated Wizard::Replace.*Button by their + Wizard::Set.*Button equivalents +- Fixed typos (bnc#383716) +- Merged SP2 changes into the trunk: + * Proofread texts + * Respect ha.cf file ordering (first udp port, then media) + (bnc#235834) + * Added missing CloseDialog, to prevent hang (bnc#231834) + or failure to write configuration to ha.cf (bnc#309202) +- 2.17.0 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz - added categories Settings and System into desktop file -- 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] r49651 - in /trunk/heartbeat/src: helps.ycp media_conf.ycp wizards.ycp
by kmachalkova＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: kmachalkova Date: Mon Aug 4 16:25:31 2008 New Revision: 49651 URL: http://svn.opensuse.org/viewcvs/yast?rev=49651&view=rev Log: Changes from SP2 branch merged into trunk Modified: trunk/heartbeat/src/helps.ycp trunk/heartbeat/src/media_conf.ycp trunk/heartbeat/src/wizards.ycp Modified: trunk/heartbeat/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/helps.ycp?rev=4965… ============================================================================== --- trunk/heartbeat/src/helps.ycp (original) +++ trunk/heartbeat/src/helps.ycp Mon Aug 4 16:25:31 2008 @@ -47,9 +47,8 @@ by entering the <tt>uname -n</tt> command on each node. ") + - _("If after adding a node to the cluster, you need to specify a -different node name for that node, double-click the node -to edit, change the node name, then click Edit. + _("If you need to specify a different node name after adding a node to the cluster, +double-click the node to edit, change its name, then click Edit. "), "media_conf" : _("Heartbeat Media Configuration lets you Modified: trunk/heartbeat/src/media_conf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/media_conf.ycp?rev… ============================================================================== --- trunk/heartbeat/src/media_conf.ycp (original) +++ trunk/heartbeat/src/media_conf.ycp Mon Aug 4 16:25:31 2008 @@ -10,6 +10,8 @@ textdomain "heartbeat"; import "Label"; +import "FileUtils"; +import "Report"; import "Wizard"; import "Heartbeat"; import "IP"; @@ -66,9 +68,14 @@ Heartbeat::config[cast] = new[cast]:[]; } }); + + string ha_cf = Heartbeat::ha_dir + "/" + "ha.cf"; - foreach(string x, ["udpport", "baud"], { - if (old[x]:"" != new[x]:"") { + //foreach(string x, ["udpport", "baud"], { + foreach(string x, [ "udpport" ], { + if (old[x]:"" != new[x]:"" || !FileUtils::Exists( ha_cf ) ){ + //set as modified also if ha.cf does not exist yet + //so the data get written (#235834) Heartbeat::config["modified"] = true; Heartbeat::config[x] = new[x]:""; } Modified: trunk/heartbeat/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/wizards.ycp?rev=49… ============================================================================== --- trunk/heartbeat/src/wizards.ycp (original) +++ trunk/heartbeat/src/wizards.ycp Mon Aug 4 16:25:31 2008 @@ -129,7 +129,7 @@ any ret = Sequencer::Run(aliases, sequence); - UI::CloseDialog(); + Wizard::CloseDialog(); return ret; } @@ -151,7 +151,7 @@ any ret = TabSequence(); - UI::CloseDialog(); + Wizard::CloseDialog(); 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] r49650 - in /trunk/installation: package/yast2-installation.changes startup/YaST2.ssh
by aschnell＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: aschnell Date: Mon Aug 4 16:24:55 2008 New Revision: 49650 URL: http://svn.opensuse.org/viewcvs/yast?rev=49650&view=rev Log: - improved text during ssh installation (bnc #411079) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.ssh Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Aug 4 16:24:55 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Aug 04 16:22:55 CEST 2008 - aschnell(a)suse.de + +- improved text during ssh installation (bnc #411079) + +------------------------------------------------------------------- Mon Aug 4 10:39:41 CEST 2008 - locilka(a)suse.cz - Added kdump proposal to SLES control file (FATE #303893). Modified: trunk/installation/startup/YaST2.ssh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.ssh?r… ============================================================================== --- trunk/installation/startup/YaST2.ssh (original) +++ trunk/installation/startup/YaST2.ssh Mon Aug 4 16:24:55 2008 @@ -27,8 +27,8 @@ Continue with booting ... - You can login with the (new?) root password or the - new created user account in a few seconds ... + You can login with the (new) root password or the + newly created user account in a few seconds ... EOF } -- 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] r49649 - in /trunk/heartbeat/src: common.ycp wizards.ycp
by kmachalkova＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: kmachalkova Date: Mon Aug 4 16:07:43 2008 New Revision: 49649 URL: http://svn.opensuse.org/viewcvs/yast?rev=49649&view=rev Log: Tak pani kolegyne, znova a lepe Modified: trunk/heartbeat/src/common.ycp trunk/heartbeat/src/wizards.ycp Modified: trunk/heartbeat/src/common.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/common.ycp?rev=496… ============================================================================== --- trunk/heartbeat/src/common.ycp (original) +++ trunk/heartbeat/src/common.ycp Mon Aug 4 16:07:43 2008 @@ -83,10 +83,10 @@ UI::ChangeWidget(`id(`back), `Enabled, conf != "node_conf"); if (conf == "startup_conf") { UI::WizardCommand(`SetNextButtonLabel( Label::FinishButton() ) ); - Wizard::SetNextButton(`PushButton(`id(`next), `opt(`key_F10), Label::FinishButton())); + Wizard::SetNextButton(`next, Label::FinishButton()); } else { UI::WizardCommand(`SetNextButtonLabel( Label::NextButton() ) ); - Wizard::SetNextButton(`PushButton(`id(`next), `opt(`key_F10), Label::NextButton())); + Wizard::SetNextButton(`next, Label::NextButton()); } } } Modified: trunk/heartbeat/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/wizards.ycp?rev=49… ============================================================================== --- trunk/heartbeat/src/wizards.ycp (original) +++ trunk/heartbeat/src/wizards.ycp Mon Aug 4 16:07:43 2008 @@ -50,17 +50,20 @@ // Buttons redefinition - Wizard::SetNextButton(`PushButton(`id(`next), `opt(`key_F10), Label::FinishButton())); + Wizard::SetNextButton(`next, Label::FinishButton()); if (UI::WidgetExists(`id(`wizardTree))) { - Wizard::SetBackButton(`PushButton(`id(`help), `opt(`key_F1), Label::HelpButton())); - Wizard::SetAbortButton(`PushButton(`id(`abort), `opt(`key_F9), Label::CancelButton())); + //we should probably not use `help ID here + //`help button is defined within Wizard standard bottom button box + //Wizard::SetBackButton((`help, Label::HelpButton())); + Wizard::SetAbortButton(`abort, Label::CancelButton()); } else { UI::WizardCommand(`SetNextButtonLabel( Label::FinishButton() ) ); UI::WizardCommand(`SetAbortButtonLabel( Label::CancelButton() ) ); - Wizard::HideBackButton(); } - + //rather, always hide back button + Wizard::HideBackButton(); + Wizard::SelectTreeItem(sequence["ws_start"]:""); any ret = Sequencer::Run(Aliases, sequence); -- 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] r49648 - /tags/stable-2_17_15/network/
by mzugec＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: mzugec Date: Mon Aug 4 15:57:22 2008 New Revision: 49648 URL: http://svn.opensuse.org/viewcvs/yast?rev=49648&view=rev Log: Created tag stable-2_17_15 for network Added: tags/stable-2_17_15/network/ - copied from r49647, trunk/network/ -- 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] r49647 - /tags/stable-2_17_15/
by mzugec＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: mzugec Date: Mon Aug 4 15:57:20 2008 New Revision: 49647 URL: http://svn.opensuse.org/viewcvs/yast?rev=49647&view=rev Log: Created tag stable-2_17_15 Added: tags/stable-2_17_15/ -- 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] r49646 - in /trunk/network: VERSION package/yast2-network.changes src/modules/Lan.ycp
by mzugec＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: mzugec Date: Mon Aug 4 15:57:14 2008 New Revision: 49646 URL: http://svn.opensuse.org/viewcvs/yast?rev=49646&view=rev Log: for ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Lan.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=49646&r1=496… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Aug 4 15:57:14 2008 @@ -1 +1 @@ -2.17.14 +2.17.15 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Aug 4 15:57:14 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Aug 4 15:56:34 CEST 2008 - mzugec(a)suse.cz + +- for ssh/vnc installation don't reload/restart network because + possibility of IP change (bnc#347482) +- 2.17.15 + +------------------------------------------------------------------- Mon Aug 4 13:22:38 CEST 2008 - mzugec(a)suse.cz - improved Lan::Packages() function Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon Aug 4 15:57:14 2008 @@ -39,6 +39,8 @@ import "PackageSystem"; import "LanItems"; import "ModuleLoading"; +import "Linuxrc"; +import "Stage"; include "network/complex.ycp"; include "network/runtime.ycp"; @@ -399,10 +401,12 @@ if(Abort()) return false; /* Progress step 6 */ ProgressNextStage(_("Writing hostname and DNS configuration...")); + // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) + if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc())) y2milestone("For ssh or vnc installation don't reload/restart network during installation."); + else if (LanItems::force_restart) SCR::Execute(.target.bash, "rcnetwork restart"); + else NetworkService::StartStop (); // write resolv.conf after change from dhcp to static (#327074) // reload/restart network before this to put correct resolv.conf from dhcp-backup - if (LanItems::force_restart) SCR::Execute(.target.bash, "rcnetwork restart"); - else NetworkService::StartStop (); DNS::Write(); Host::Write(); Progress::set (orig); -- 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] r49645 - /tags/stable-2_17_6/devtools/
by locilka＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: locilka Date: Mon Aug 4 15:49:18 2008 New Revision: 49645 URL: http://svn.opensuse.org/viewcvs/yast?rev=49645&view=rev Log: Created tag stable-2_17_6 for devtools Added: tags/stable-2_17_6/devtools/ - copied from r49644, trunk/devtools/ -- 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] r49644 - in /trunk/devtools: package/yast2-devtools.changes ycpdoc/testsuite/t1-t1-example.html ycpdoc/testsuite/t1-t1-mis.html ycpdoc/testsuite/t1-t1-modules.html ycpdoc/testsuite/t1.out
by locilka＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: locilka Date: Mon Aug 4 15:48:58 2008 New Revision: 49644 URL: http://svn.opensuse.org/viewcvs/yast?rev=49644&view=rev Log: Adapted testsuites Modified: trunk/devtools/package/yast2-devtools.changes trunk/devtools/ycpdoc/testsuite/t1-t1-example.html trunk/devtools/ycpdoc/testsuite/t1-t1-mis.html trunk/devtools/ycpdoc/testsuite/t1-t1-modules.html trunk/devtools/ycpdoc/testsuite/t1.out Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Mon Aug 4 15:48:58 2008 @@ -3,6 +3,7 @@ - Generating better XML (Authors section) to be easier-to-process by XSLT transformations (bnc #401680). +- Adapted testsuites. - 2.17.6 ------------------------------------------------------------------- Modified: trunk/devtools/ycpdoc/testsuite/t1-t1-example.html URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/ycpdoc/testsuite/t1-t1-… ============================================================================== --- trunk/devtools/ycpdoc/testsuite/t1-t1-example.html (original) +++ trunk/devtools/ycpdoc/testsuite/t1-t1-example.html Mon Aug 4 15:48:58 2008 @@ -71,8 +71,8 @@ <tr> <td> <ul> - <li> Petr Blahos <<a href="mailto:pblahos@suse.cz">pblahos(a)suse.cz</a>></li> - <li> Other Author <<a href="mailto:his_mail@suse.de">his_mail(a)suse.de</a>></li> + <li> Petr Blahos <pblahos(a)suse.cz></li> + <li> Other Author <his_mail(a)suse.de></li> </ul> </td> </tr> Modified: trunk/devtools/ycpdoc/testsuite/t1-t1-mis.html URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/ycpdoc/testsuite/t1-t1-… ============================================================================== --- trunk/devtools/ycpdoc/testsuite/t1-t1-mis.html (original) +++ trunk/devtools/ycpdoc/testsuite/t1-t1-mis.html Mon Aug 4 15:48:58 2008 @@ -71,7 +71,7 @@ <tr> <td> <ul> - <li> Petr Blahos <<a href="mailto:pblahos@suse.cz">pblahos(a)suse.cz</a>></li> + <li> Petr Blahos <pblahos(a)suse.cz></li> </ul> </td> </tr> Modified: trunk/devtools/ycpdoc/testsuite/t1-t1-modules.html URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/ycpdoc/testsuite/t1-t1-… ============================================================================== --- trunk/devtools/ycpdoc/testsuite/t1-t1-modules.html (original) +++ trunk/devtools/ycpdoc/testsuite/t1-t1-modules.html Mon Aug 4 15:48:58 2008 @@ -71,7 +71,7 @@ <tr> <td> <ul> - <li> Petr Blahos <<a href="mailto:pblahos@suse.cz">pblahos(a)suse.cz</a>></li> + <li> Petr Blahos <pblahos(a)suse.cz></li> </ul> </td> </tr> Modified: trunk/devtools/ycpdoc/testsuite/t1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/ycpdoc/testsuite/t1.out… ============================================================================== --- trunk/devtools/ycpdoc/testsuite/t1.out (original) +++ trunk/devtools/ycpdoc/testsuite/t1.out Mon Aug 4 15:48:58 2008 @@ -5,9 +5,9 @@ ><header ><authors ><ITEM -> Petr Blahos &lt;<a href="mailto:pblahos@suse.cz">pblahos(a)suse.cz</a>&gt;</ITEM +> Petr Blahos <pblahos(a)suse.cz></ITEM ><ITEM -> Other Author &lt;<a href="mailto:his_mail@suse.de">his_mail(a)suse.de</a>&gt;</ITEM +> Other Author <his_mail(a)suse.de></ITEM ></authors ><descr > @@ -207,7 +207,7 @@ ><header ><authors ><ITEM -> Petr Blahos &lt;<a href="mailto:pblahos@suse.cz">pblahos(a)suse.cz</a>&gt;</ITEM +> Petr Blahos <pblahos(a)suse.cz></ITEM ></authors ><descr > @@ -272,7 +272,7 @@ ><header ><authors ><ITEM -> Petr Blahos &lt;<a href="mailto:pblahos@suse.cz">pblahos(a)suse.cz</a>&gt;</ITEM +> Petr Blahos <pblahos(a)suse.cz></ITEM ></authors ><descr > -- 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] r49643 - in /trunk/heartbeat/src: commandline.ycp heartbeat.ycp ipfail_conf.ycp startup_conf.ycp
by kmachalkova＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: kmachalkova Date: Mon Aug 4 15:43:59 2008 New Revision: 49643 URL: http://svn.opensuse.org/viewcvs/yast?rev=49643&view=rev Log: Fixed typos (#383716) Modified: trunk/heartbeat/src/commandline.ycp trunk/heartbeat/src/heartbeat.ycp trunk/heartbeat/src/ipfail_conf.ycp trunk/heartbeat/src/startup_conf.ycp Modified: trunk/heartbeat/src/commandline.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/commandline.ycp?re… ============================================================================== --- trunk/heartbeat/src/commandline.ycp (original) +++ trunk/heartbeat/src/commandline.ycp Mon Aug 4 15:43:59 2008 @@ -129,7 +129,7 @@ options = filter(string optn, options, {return optn != nil && optn != "";}); - CommandLine::Print(sformat(_("Multicast device: %1, adress: %2, UDP: %3, TTL: %4"), + CommandLine::Print(sformat(_("Multicast device: %1, address: %2, UDP: %3, TTL: %4"), options[0]:"", options[1]:"", options[2]:"", options[3]:"")); } ); Modified: trunk/heartbeat/src/heartbeat.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/heartbeat.ycp?rev=… ============================================================================== --- trunk/heartbeat/src/heartbeat.ycp (original) +++ trunk/heartbeat/src/heartbeat.ycp Mon Aug 4 15:43:59 2008 @@ -78,7 +78,7 @@ ], "type" : $[ // translators: command line help text for the 'play' option - "help" : _("Communication mode, can be 'bcast' for broadcast or 'mcast' for multicat."), + "help" : _("Communication mode, can be 'bcast' for broadcast or 'mcast' for multicast."), "type" : "string" ], "device" : $[ @@ -88,7 +88,7 @@ ], "address" : $[ // translators: command line help text for the 'play' option - "help" : _("IP address of the multicats group (224.0.0.0 - 239.255.255.255)."), + "help" : _("IP address of the multicast group (224.0.0.0 - 239.255.255.255)."), "type" : "string" ], "ttl" : $[ Modified: trunk/heartbeat/src/ipfail_conf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/ipfail_conf.ycp?re… ============================================================================== --- trunk/heartbeat/src/ipfail_conf.ycp (original) +++ trunk/heartbeat/src/ipfail_conf.ycp Mon Aug 4 15:43:59 2008 @@ -321,7 +321,7 @@ boolean ipok = true; foreach(string s, (list<string>)ip, { if (!IP::Check4(s)) ipok = false; }); if (!ipok) { - Report::Error(_("Bad list of IP adresses.")); + Report::Error(_("Bad list of IP addresses.")); continue; } @@ -343,7 +343,7 @@ boolean ipok = true; foreach(string s, (list<string>)ip, { if (!IP::Check4(s)) ipok = false; }); if (!ipok) { - Report::Error(_("Bad list of IP adresses.")); + Report::Error(_("Bad list of IP addresses.")); continue; } Modified: trunk/heartbeat/src/startup_conf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/startup_conf.ycp?r… ============================================================================== --- trunk/heartbeat/src/startup_conf.ycp (original) +++ trunk/heartbeat/src/startup_conf.ycp Mon Aug 4 15:43:59 2008 @@ -74,7 +74,7 @@ UI::ChangeWidget (`id ("stop_now"), `Enabled, status==0); UI::ReplaceWidget (`id ("status_rp"), - `Label (status==0 ? _("Hearbeat server is running.") : _("Heartbeat server is not running."))); + `Label (status==0 ? _("Heartbeat server is running.") : _("Heartbeat server is not running."))); ret = UI::UserInput(); -- 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] r49642 - /tags/stable-2_17_6/devtools/
by locilka＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: locilka Date: Mon Aug 4 15:41:39 2008 New Revision: 49642 URL: http://svn.opensuse.org/viewcvs/yast?rev=49642&view=rev Log: Hmm, testsuites Removed: tags/stable-2_17_6/devtools/ -- 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] r49641 - /tags/stable-2_17_6/devtools/
by locilka＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: locilka Date: Mon Aug 4 15:37:01 2008 New Revision: 49641 URL: http://svn.opensuse.org/viewcvs/yast?rev=49641&view=rev Log: Created tag stable-2_17_6 for devtools Added: tags/stable-2_17_6/devtools/ - copied from r49640, trunk/devtools/ -- 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] r49640 - /tags/stable-2_17_10/storage/
by aschnell＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: aschnell Date: Mon Aug 4 15:36:47 2008 New Revision: 49640 URL: http://svn.opensuse.org/viewcvs/yast?rev=49640&view=rev Log: Created tag stable-2_17_10 for storage Added: tags/stable-2_17_10/storage/ - copied from r49639, trunk/storage/ -- 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] r49639 - in /trunk/heartbeat/src: common.ycp wizards.ycp
by kmachalkova＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: kmachalkova Date: Mon Aug 4 15:36:12 2008 New Revision: 49639 URL: http://svn.opensuse.org/viewcvs/yast?rev=49639&view=rev Log: s/Replace.*Button/Set.*Button/g (these are no longer part of Wizard.ycp) Modified: trunk/heartbeat/src/common.ycp trunk/heartbeat/src/wizards.ycp Modified: trunk/heartbeat/src/common.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/common.ycp?rev=496… ============================================================================== --- trunk/heartbeat/src/common.ycp (original) +++ trunk/heartbeat/src/common.ycp Mon Aug 4 15:36:12 2008 @@ -83,10 +83,10 @@ UI::ChangeWidget(`id(`back), `Enabled, conf != "node_conf"); if (conf == "startup_conf") { UI::WizardCommand(`SetNextButtonLabel( Label::FinishButton() ) ); - Wizard::ReplaceNextButton(`PushButton(`id(`next), `opt(`key_F10), Label::FinishButton())); + Wizard::SetNextButton(`PushButton(`id(`next), `opt(`key_F10), Label::FinishButton())); } else { UI::WizardCommand(`SetNextButtonLabel( Label::NextButton() ) ); - Wizard::ReplaceNextButton(`PushButton(`id(`next), `opt(`key_F10), Label::NextButton())); + Wizard::SetNextButton(`PushButton(`id(`next), `opt(`key_F10), Label::NextButton())); } } } Modified: trunk/heartbeat/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/wizards.ycp?rev=49… ============================================================================== --- trunk/heartbeat/src/wizards.ycp (original) +++ trunk/heartbeat/src/wizards.ycp Mon Aug 4 15:36:12 2008 @@ -50,11 +50,11 @@ // Buttons redefinition - Wizard::ReplaceNextButton(`PushButton(`id(`next), `opt(`key_F10), Label::FinishButton())); + Wizard::SetNextButton(`PushButton(`id(`next), `opt(`key_F10), Label::FinishButton())); if (UI::WidgetExists(`id(`wizardTree))) { - Wizard::ReplaceBackButton(`PushButton(`id(`help), `opt(`key_F1), Label::HelpButton())); - Wizard::ReplaceAbortButton(`PushButton(`id(`abort), `opt(`key_F9), Label::CancelButton())); + Wizard::SetBackButton(`PushButton(`id(`help), `opt(`key_F1), Label::HelpButton())); + Wizard::SetAbortButton(`PushButton(`id(`abort), `opt(`key_F9), Label::CancelButton())); } else { UI::WizardCommand(`SetNextButtonLabel( Label::FinishButton() ) ); UI::WizardCommand(`SetAbortButtonLabel( Label::CancelButton() ) ); -- 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] r49638 - /trunk/yast2/library/wizard/src/Progress.ycp
by mzugec＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: mzugec Date: Mon Aug 4 15:31:27 2008 New Revision: 49638 URL: http://svn.opensuse.org/viewcvs/yast?rev=49638&view=rev Log: replace widget only if such exists Modified: trunk/yast2/library/wizard/src/Progress.ycp Modified: trunk/yast2/library/wizard/src/Progress.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/wizard/src/Progres… ============================================================================== --- trunk/yast2/library/wizard/src/Progress.ycp (original) +++ trunk/yast2/library/wizard/src/Progress.ycp Mon Aug 4 15:31:27 2008 @@ -489,7 +489,8 @@ } } - UI::ReplaceWidget (`id (`contents), bar); + // patch from Michal Srb https://bugzilla.novell.com/show_bug.cgi?id=406890#c7 + if (UI::WidgetExists (`id (`contents))) UI::ReplaceWidget (`id (`contents), bar); if (! UI::WizardCommand(`SetDialogHeading( window_title ) ) ) { -- 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] r49637 - in /trunk/doc/tdg: list_of_books.txt pkg-bindings/ yast.xml
by locilka＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: locilka Date: Mon Aug 4 15:26:49 2008 New Revision: 49637 URL: http://svn.opensuse.org/viewcvs/yast?rev=49637&view=rev Log: Pkg bindings... WIP Removed: trunk/doc/tdg/pkg-bindings/ Modified: trunk/doc/tdg/list_of_books.txt trunk/doc/tdg/yast.xml Modified: trunk/doc/tdg/list_of_books.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/tdg/list_of_books.txt?rev=49… ============================================================================== --- trunk/doc/tdg/list_of_books.txt (original) +++ trunk/doc/tdg/list_of_books.txt Mon Aug 4 15:26:49 2008 @@ -10,3 +10,4 @@ Book-YaSTDevtools Book-YaSTReference Book-UIReference +Book-pkg-bindings Modified: trunk/doc/tdg/yast.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/tdg/yast.xml?rev=49637&r1=49… ============================================================================== --- trunk/doc/tdg/yast.xml (original) +++ trunk/doc/tdg/yast.xml Mon Aug 4 15:26:49 2008 @@ -17,6 +17,7 @@ <!ENTITY modules SYSTEM "modules/modules.xml"> <!ENTITY app_ref SYSTEM "reference/app_ref.xml"> <!ENTITY generated-docu SYSTEM "generated-docu/documentation.xml"> +<!ENTITY generated-pkg-bindings SYSTEM "pkg-bindings/builtins.xml">  <!ENTITY % installation-entities SYSTEM "installation/entities"> @@ -214,4 +215,6 @@ </chapter> </book> --> + + &generated-pkg-bindings; </set> -- 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] r49636 - in /trunk/devtools: VERSION package/yast2-devtools.changes scrdoc/src/scrdoc ycpdoc/src/ycpdoc
by locilka＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: locilka Date: Mon Aug 4 15:19:05 2008 New Revision: 49636 URL: http://svn.opensuse.org/viewcvs/yast?rev=49636&view=rev Log: - Generating better XML (Authors section) to be easier-to-process by XSLT transformations (bnc #401680). - 2.17.6 Modified: trunk/devtools/VERSION trunk/devtools/package/yast2-devtools.changes trunk/devtools/scrdoc/src/scrdoc trunk/devtools/ycpdoc/src/ycpdoc Modified: trunk/devtools/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/VERSION?rev=49636&r1=49… ============================================================================== --- trunk/devtools/VERSION (original) +++ trunk/devtools/VERSION Mon Aug 4 15:19:05 2008 @@ -1 +1 @@ -2.17.5 +2.17.6 Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Mon Aug 4 15:19:05 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Aug 4 14:55:49 CEST 2008 - locilka(a)suse.cz + +- Generating better XML (Authors section) to be easier-to-process + by XSLT transformations (bnc #401680). +- 2.17.6 + +------------------------------------------------------------------- Wed Jul 30 15:19:51 CEST 2008 - mvidner(a)suse.cz - Added yastdoc (http://en.opensuse.org/YaST/yastdoc). Modified: trunk/devtools/scrdoc/src/scrdoc URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/scrdoc/src/scrdoc?rev=4… ============================================================================== --- trunk/devtools/scrdoc/src/scrdoc (original) +++ trunk/devtools/scrdoc/src/scrdoc Mon Aug 4 15:19:05 2008 @@ -722,7 +722,11 @@ if (defined $MP->{'Authors'}) { $writer->startTag('authors'); - $writer->characters($MP->{'Authors'}); + foreach my $author (split (/\n/, $MP->{'Authors'})) { + $writer->startTag('ITEM'); + $writer->characters($author); + $writer->endTag('ITEM'); + } $writer->endTag('authors'); } Modified: trunk/devtools/ycpdoc/src/ycpdoc URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/ycpdoc/src/ycpdoc?rev=4… ============================================================================== --- trunk/devtools/ycpdoc/src/ycpdoc (original) +++ trunk/devtools/ycpdoc/src/ycpdoc Mon Aug 4 15:19:05 2008 @@ -851,7 +851,7 @@ foreach my $a (@lines) { #TODO: warn on unknown key, missing field - if ($a =~ s/^\s*(Module|Package|File|Summary|Depends|Authors|Author):\s*(.*)/$2/) + if ($a =~ s/^\s*(Module|Package|File|Summary|Depends|Authors|Author|Flags):\s*(.*)/$2/) { $key = lc $1; # Module is old style, Package is new style. TODO, define meaning @@ -880,7 +880,8 @@ { my $mail = $a; $mail =~ s/[^<(]*[(<]([^>)]*).*/$1/g; - $a =~ s/[(<][^>)]*[>)]/<<a href=\"mailto:$mail\">$mail<\/a>>/g; # "emacs + # $a =~ s/[(<][^>)]*[>)]/<<a href=\"mailto:$mail\">$mail<\/a>>/g; # "emacs + if ($a !~ /^\s*$/) { push @{$parsed_header->{$key}}, $a; @@ -902,6 +903,7 @@ $parsed_header->{$key} = almost_html ($a); } } + } return $parsed_header; } -- 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] r49635 - in /trunk/doc: modules/yast2_modules.xslt scr/yast2_scr.xslt
by locilka＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: locilka Date: Mon Aug 4 15:07:04 2008 New Revision: 49635 URL: http://svn.opensuse.org/viewcvs/yast?rev=49635&view=rev Log: Generating also 'Authors:' for SCR Agents and YCP Modules Modified: trunk/doc/modules/yast2_modules.xslt trunk/doc/scr/yast2_scr.xslt Modified: trunk/doc/modules/yast2_modules.xslt URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/modules/yast2_modules.xslt?r… ============================================================================== --- trunk/doc/modules/yast2_modules.xslt (original) +++ trunk/doc/modules/yast2_modules.xslt Mon Aug 4 15:07:04 2008 @@ -74,6 +74,18 @@ <para> <xsl:value-of select="./header/summary"/> </para> + +  + <xsl:if test="./header/authors"> + <sect2> + <title>Authors</title> + <itemizedlist> + <xsl:for-each select="./header/authors/ITEM"> + <listitem><para><xsl:value-of select="."/></para></listitem> + </xsl:for-each> + </itemizedlist> + </sect2> + </xsl:if> </xsl:template>  Modified: trunk/doc/scr/yast2_scr.xslt URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/scr/yast2_scr.xslt?rev=49635… ============================================================================== --- trunk/doc/scr/yast2_scr.xslt (original) +++ trunk/doc/scr/yast2_scr.xslt Mon Aug 4 15:07:04 2008 @@ -34,6 +34,7 @@ </xsl:choose> </title> <xsl:call-template name="scr-summary"/> + <xsl:call-template name="scr-authors"/> <sect3> <title>Description</title> <xsl:call-template name="scr-general"/> @@ -55,6 +56,21 @@ </xsl:if> </xsl:template> + <xsl:template name="scr-authors"> +  +  + <xsl:if test="./authors"> + <sect3> + <title>Authors</title> + <itemizedlist> + <xsl:for-each select="./authors/ITEM"> + <listitem><para><xsl:value-of select="."/></para></listitem> + </xsl:for-each> + </itemizedlist> + </sect3> + </xsl:if> + </xsl:template> + <xsl:template name="scr-general">  <xsl:if test="./general"> -- 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] r49634 - in /trunk/storage: VERSION configure.in.in package/yast2-storage.changes yast2-storage.spec.in
by aschnell＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: aschnell Date: Mon Aug 4 15:06:12 2008 New Revision: 49634 URL: http://svn.opensuse.org/viewcvs/yast?rev=49634&view=rev Log: - changed default mount-by to path on s390 (fate #303557) Modified: trunk/storage/VERSION trunk/storage/configure.in.in trunk/storage/package/yast2-storage.changes trunk/storage/yast2-storage.spec.in Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=49634&r1=496… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Mon Aug 4 15:06:12 2008 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: trunk/storage/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/configure.in.in?rev=4963… ============================================================================== --- trunk/storage/configure.in.in (original) +++ trunk/storage/configure.in.in Mon Aug 4 15:06:12 2008 @@ -5,8 +5,7 @@ @YAST2-INIT-YCP@ @YAST2-INIT-PROGRAM@ -AM_CONDITIONAL(ARCH_S390, test "$target_cpu" == "s390x" -o "$target_cpu" == "s390") - +## check for some programs AC_CHECK_PROGS([SWIG], [swig]) if test -z "$SWIG"; then AC_MSG_ERROR([install swig]) Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Aug 4 15:06:12 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 04 15:00:26 CEST 2008 - aschnell(a)suse.de + +- changed default mount-by to path on s390 (fate #303557) +- version 2.17.10 + +------------------------------------------------------------------- Mon Aug 04 11:37:49 CEST 2008 - aschnell(a)suse.de - fixed handling of renamed devices during update (bnc #392086) Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Mon Aug 4 15:06:12 2008 @@ -17,9 +17,8 @@ Obsoletes: yast2-agent-fdisk yast2-agent-fdisk-devel Provides: yast2-trans-inst-partitioning Obsoletes: yast2-trans-inst-partitioning -Provides: y2t_inst-partitioning -Obsoletes: y2t_inst-partitioning - +Provides: y2t_inst-partitioning +Obsoletes: y2t_inst-partitioning Summary: - %description @@ -29,6 +28,9 @@ @PREP@ @BUILD@ +%ifarch s390 s390x +sed -i -e 's/DEVICE_NAMES=".*"/DEVICE_NAMES="path"/' data/sysconfig.storage +%endif @INSTALL@ rm -f $RPM_BUILD_ROOT/@plugindir@/libpy2StorageCallbacks.la -- 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] r49633 - /tags/stable-2_17_8/bootloader/
by juhliarik＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: juhliarik Date: Mon Aug 4 14:03:05 2008 New Revision: 49633 URL: http://svn.opensuse.org/viewcvs/yast?rev=49633&view=rev Log: Created tag stable-2_17_8 for bootloader Added: tags/stable-2_17_8/bootloader/ - copied from r49632, trunk/bootloader/ -- 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] r49632 - /trunk/packager/src/include/repositories_include.ycp
by jsrain＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: jsrain Date: Mon Aug 4 13:54:18 2008 New Revision: 49632 URL: http://svn.opensuse.org/viewcvs/yast?rev=49632&view=rev Log: changed textdomain Modified: trunk/packager/src/include/repositories_include.ycp Modified: trunk/packager/src/include/repositories_include.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/repositorie… ============================================================================== --- trunk/packager/src/include/repositories_include.ycp (original) +++ trunk/packager/src/include/repositories_include.ycp Mon Aug 4 13:54:18 2008 @@ -23,7 +23,7 @@ import "Report"; import "Register"; - textdomain "textdomain"; + textdomain "packager"; list<map<string,any> > sourceStatesIn = []; list<map<string,any> > sourceStatesOut = []; -- 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] r49631 - /trunk/firstboot/src/firstboot_auto.ycp
by jsrain＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: jsrain Date: Mon Aug 4 13:52:27 2008 New Revision: 49631 URL: http://svn.opensuse.org/viewcvs/yast?rev=49631&view=rev Log: fixed typo in textdomain Modified: trunk/firstboot/src/firstboot_auto.ycp Modified: trunk/firstboot/src/firstboot_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_auto.ycp… ============================================================================== --- trunk/firstboot/src/firstboot_auto.ycp (original) +++ trunk/firstboot/src/firstboot_auto.ycp Mon Aug 4 13:52:27 2008 @@ -7,7 +7,7 @@ import "Label"; import "Wizard"; - textdomain "firsboot"; + textdomain "firstboot"; any ret = nil; string func = ""; -- 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] r49630 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes src/grub/misc.ycp src/modules/BootGRUB.ycp
by juhliarik＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: juhliarik Date: Mon Aug 4 13:34:56 2008 New Revision: 49630 URL: http://svn.opensuse.org/viewcvs/yast?rev=49630&view=rev Log: - new version 2.17.8 - added support for reducing devices from device.map (fate #303548) - correct typo checkWidnowsSection() -> checkWindowsSection M bootloader/src/grub/misc.ycp M bootloader/src/modules/BootGRUB.ycp * added support for deleting devices from device.map (devices > 8) Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/modules/BootGRUB.ycp Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=49630&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Mon Aug 4 13:34:56 2008 @@ -1 +1 @@ -2.17.7 +2.17.8 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Mon Aug 4 13:34:56 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Aug 4 13:29:01 CEST 2008 - juhliarik(a)suse.cz + +- added support for reducing devices from device.map to 8 devices + (fate #303548) +- 2.17.8 + +------------------------------------------------------------------- Thu Jul 31 10:27:42 CEST 2008 - juhliarik(a)suse.cz - added support for remaping windows chainloader boot section Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev… ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Mon Aug 4 13:34:56 2008 @@ -1080,7 +1080,7 @@ * @return list of sections */ -define list<map<string,any> > checkWidnowsSection(list<map<string,any> > sections) +define list<map<string,any> > checkWindowsSection(list<map<string,any> > sections) { // list of idexes from sections where is chainloader @@ -1118,13 +1118,11 @@ /** * FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 - * The function reduce record (devices) in device.map + * The function reduces records (devices) in device.map * Grub doesn't support more than 8 devices in device.map - * There is selected the first 7 devices + boot or root device - * @param string boot device with udev id name - * @return boolean true if there was added boot device (disk) and it the 9th or following disk in order + * @return boolean true if device map was reduced */ -global boolean ReduceDeviceMapTo8(string boot_dev, string boot_dev_mountby) +global boolean ReduceDeviceMapTo8() { boolean result = false; @@ -1146,42 +1144,88 @@ y2debug("inverse_device_map: %1", inverse_device_map); integer index = 0; - boolean boot_device_added = false; + foreach(string key, bios_order, { string device_name = inverse_device_map[key]:""; + if (index < 8) { y2debug("adding device: %1 with key: %2 and index is: %3", device_name, key, index); new_device_map[device_name]=key; + index = index + 1; + } else { + break; + } + }); + BootCommon::device_mapping = new_device_map; + y2milestone("Device map after reducing: %1", BootCommon::device_mapping); + } else { + y2milestone("Device map includes less than 9 devices. It is not reduced. device_map: %1", BootCommon::device_mapping); + } + return result; +} + + +/** + * FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 + * The function check if boot device is in device.map + * Grub doesn't support more than 8 devices in device.map + * @param string boot device + * @param string boot device with name by mountby + * @return boolean true if there is missing boot device + */ +define boolean checkBootDeviceInDeviceMap(string boot_dev, string boot_dev_mountby) +{ + boolean result = false; + + if (size(BootCommon::device_mapping)>8) + { + result = false; + list <string> bios_order = (list <string> ) Map::Values(BootCommon::device_mapping); + //delete all grub devices with order more than 9 + bios_order = filter(string key, bios_order, {return (size(key) < 4);}); + bios_order = lsort(bios_order); + y2debug("ordered values (grub devices): %1", bios_order); + map<string,string> inverse_device_map = $[]; + foreach(string key, string value, BootCommon::device_mapping, + { + inverse_device_map[value]=key; + }); + + y2debug("inverse_device_map: %1", inverse_device_map); + integer index = 0; + boolean boot_device_added = false; + foreach(string key, bios_order, + { + string device_name = inverse_device_map[key]:""; + + if (index < 8) + { if ((device_name == boot_dev) || (device_name == boot_dev_mountby)) boot_device_added = true; index = index + 1; } else { if (boot_device_added) { - //new_device_map[device_name]=key; - y2milestone("Device map includes boot disk"); break; } else { - y2error("Device map doesn't include boot disk"); result = true; break; - } } }); - BootCommon::device_mapping = new_device_map; - y2milestone("Device map with the first 7 device + boot device: %1", BootCommon::device_mapping); } else { - y2milestone("Device map includes less than 9 devices. It is not reduced. device_map: %1", BootCommon::device_mapping); + y2milestone("Device map includes less than 9 devices."); } return result; } + + } //last "}" /* Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Mon Aug 4 13:34:56 2008 @@ -626,7 +626,11 @@ { // check if windows is on second disk and add remap if it is necessary // FATE #301994: Correct device mapping in case windows is installed on the second HD - BootCommon::sections = checkWidnowsSection(BootCommon::sections); + BootCommon::sections = checkWindowsSection(BootCommon::sections); + + // reduce device map to 8 devices + // FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 + ReduceDeviceMapTo8(); // now really save the settings boolean ret = BootCommon::Save (clean, init, flush); @@ -849,8 +853,10 @@ global boolean CheckDeviceMap() { // FATE #303548 - Grub: limit device.map to devices detected by BIOS + boolean ret = false; string boot_disk = BootCommon::getBootDisk(); - boolean ret = ReduceDeviceMapTo8(boot_disk, BootCommon::DevToLabelUdevID(boot_disk)); + if (boot_disk != "") + ret = checkBootDeviceInDeviceMap(boot_disk, BootCommon::DevToLabelUdevID(boot_disk)); 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] r49629 - /tags/stable-2_17_14/network/
by mzugec＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: mzugec Date: Mon Aug 4 13:25:02 2008 New Revision: 49629 URL: http://svn.opensuse.org/viewcvs/yast?rev=49629&view=rev Log: Created tag stable-2_17_14 for network Added: tags/stable-2_17_14/network/ - copied from r49628, trunk/network/ -- 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] r49628 - /tags/stable-2_17_14/
by mzugec＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: mzugec Date: Mon Aug 4 13:25:01 2008 New Revision: 49628 URL: http://svn.opensuse.org/viewcvs/yast?rev=49628&view=rev Log: Created tag stable-2_17_14 Added: tags/stable-2_17_14/ -- 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] r49627 - in /trunk/network: VERSION package/yast2-network.changes src/lan/address.ycp src/modules/Lan.ycp src/modules/LanItems.ycp
by mzugec＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: mzugec Date: Mon Aug 4 13:24:52 2008 New Revision: 49627 URL: http://svn.opensuse.org/viewcvs/yast?rev=49627&view=rev Log: improved Lan::Packages() function added STARTMODE=onboot for tun/tap devices (FaTE#302184) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/modules/LanItems.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=49627&r1=496… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Aug 4 13:24:52 2008 @@ -1 +1 @@ -2.17.13 +2.17.14 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Aug 4 13:24:52 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Aug 4 13:22:38 CEST 2008 - mzugec(a)suse.cz + +- improved Lan::Packages() function +- added STARTMODE=onboot for tun/tap devices (FaTE#302184) +- 2.17.14 + +------------------------------------------------------------------- Mon Jul 28 11:06:05 CEST 2008 - mzugec(a)suse.cz - use all devices for InternetTest, not only eth (bnc#400632) Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=… ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Mon Aug 4 13:24:52 2008 @@ -732,6 +732,7 @@ { settings = $[ "BOOTPROTO": "static", + "STARTMODE": "onboot", "TUNNEL" : LanItems::type, "TUNNEL_SET_PERSISTENT" : LanItems::tunnel_set_persistent ? "yes" : "no", "TUNNEL_SET_OWNER" : LanItems::tunnel_set_owner, Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon Aug 4 13:24:52 2008 @@ -1123,29 +1123,42 @@ if (!PackageSystem::Installed("smpppd")) pkgs = add (pkgs, "smpppd"); } */ - if (NetworkInterfaces::Locate ("STARTMODE", "ifplugd") != []) - { - if (!PackageSystem::Installed("ifplugd")) pkgs = add (pkgs, "ifplugd"); - } - // #suse49880 - if (NetworkInterfaces::List ("wlan") != []) - { - if (!PackageSystem::Installed("wireless-tools")) pkgs = add (pkgs, "wireless-tools"); - } - if (NetworkInterfaces::List ("vlan") != []) - { - if (!PackageSystem::Installed("vlan")) pkgs = add (pkgs, "vlan"); - } - if (NetworkInterfaces::List ("br") != []) - { - if (!PackageSystem::Installed("bridge-utils")) pkgs = add (pkgs, "bridge-utils"); - } - // #47809 - if (NetworkInterfaces::Locate ("WIRELESS_AUTH_MODE", "psk") != [] || - NetworkInterfaces::Locate ("WIRELESS_AUTH_MODE", "eap") != []) - { - if (!PackageSystem::Installed("wpa_supplicant")) pkgs = add (pkgs, "wpa_supplicant"); - } + map<string, any> required = $[ + "types":$[ + "wlan" : "wireless-tools", + "vlan" : "vlan", + "br" : "bridge-utils", + "tun" : "tunctl", + "tap" : "tunctl" + ], + "options":$[ + "STARTMODE":$[ + "ifplugd" : "ifplugd" + ], + "WIRELESS_AUTH_MODE":$[ + "psk" : "wpa_supplicant", + "eap" : "wpa_supplicant" + ] + ] + ]; + + foreach(string type, (list<string>)Map::Keys(required["types"]:$[]), { + string package=required["types", type]:""; + if (size( NetworkInterfaces::List(type) ) > 0) + y2milestone("Network interface type %1 requires package %2", type, package); + if (!PackageSystem::Installed( package )) pkgs = add (pkgs, package); + }); + + + foreach(string type, (list<string>)Map::Keys(required["options"]:$[]), { + foreach(string option, (list<string>)Map::Keys(required["options", type]:$[]), { + string package=required["options", type, option]:""; + if (NetworkInterfaces::Locate (type, option) != []) + y2milestone("Network interface with options %1, %2 requires package %3", type, option, package); + if (!PackageSystem::Installed(package)) pkgs = add (pkgs, package); + }); + }); + if (NetworkService::IsManaged ()) { if (!PackageSystem::Installed("NetworkManager")) pkgs = add (pkgs, "NetworkManager"); Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp… ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Mon Aug 4 13:24:52 2008 @@ -1203,6 +1203,7 @@ if (contains(["tun", "tap"], type)){ newdev=$[ "BOOTPROTO" : "static", + "STARTMODE" : "onboot", "TUNNEL" : type, "TUNNEL_SET_PERSISTENT" : tunnel_set_persistent ? "yes" : "no", "TUNNEL_SET_OWNER" : tunnel_set_owner, -- 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] r49626 - /tags/stable-2_17_1/update/
by locilka＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: locilka Date: Mon Aug 4 13:20:48 2008 New Revision: 49626 URL: http://svn.opensuse.org/viewcvs/yast?rev=49626&view=rev Log: Created tag stable-2_17_1 for update Added: tags/stable-2_17_1/update/ - copied from r49625, trunk/update/ -- 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] r49625 - /trunk/pkg-bindings/src/PkgFunctions.cc
by jsrain＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: jsrain Date: Mon Aug 4 13:20:46 2008 New Revision: 49625 URL: http://svn.opensuse.org/viewcvs/yast?rev=49625&view=rev Log: added missing textdomain Modified: trunk/pkg-bindings/src/PkgFunctions.cc Modified: trunk/pkg-bindings/src/PkgFunctions.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgFunctions.cc… ============================================================================== --- trunk/pkg-bindings/src/PkgFunctions.cc (original) +++ trunk/pkg-bindings/src/PkgFunctions.cc Mon Aug 4 13:20:46 2008 @@ -43,6 +43,9 @@ // textdomain #include <libintl.h> +/* + Textdomain "pkg-bindings" +*/ ///////////////////////////////////////////////////////////////////////////// -- 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] r49624 - /trunk/update/VERSION
by locilka＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: locilka Date: Mon Aug 4 13:20:40 2008 New Revision: 49624 URL: http://svn.opensuse.org/viewcvs/yast?rev=49624&view=rev Log: version Modified: trunk/update/VERSION Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=49624&r1=4962… ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Mon Aug 4 13:20:40 2008 @@ -1 +1 @@ -2.17.0 +2.17.1 -- 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] r49623 - in /trunk/update: package/yast2-update.changes src/clients/run_update.ycp
by locilka＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: locilka Date: Mon Aug 4 13:19:47 2008 New Revision: 49623 URL: http://svn.opensuse.org/viewcvs/yast?rev=49623&view=rev Log: - Initializing target as soon as possible (updating running system) (bnc #394662). - 2.17.1 Modified: trunk/update/package/yast2-update.changes trunk/update/src/clients/run_update.ycp Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Mon Aug 4 13:19:47 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Aug 4 13:18:47 CEST 2008 - locilka(a)suse.cz + +- Initializing target as soon as possible (updating running system) + (bnc #394662). +- 2.17.1 + +------------------------------------------------------------------- Wed Jul 30 07:19:56 CEST 2008 - coolo(a)suse.de - fix file list of package Modified: trunk/update/src/clients/run_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/run_update.yc… ============================================================================== --- trunk/update/src/clients/run_update.ycp (original) +++ trunk/update/src/clients/run_update.ycp Mon Aug 4 13:19:47 2008 @@ -18,6 +18,7 @@ import "ProductControl"; import "Wizard"; import "Update"; + import "Installation"; // check whether having the packager for ourselves if (! PackageLock::Check ()) @@ -41,6 +42,10 @@ list<map> stage_mode = [$["stage": "normal", "mode": Mode::mode() ]]; ProductControl::AddWizardSteps(stage_mode); + // bnc #394662 + // initialize target ASAP + Pkg::TargetInit (Installation::destdir, true); + symbol ret = ProductControl::Run(); Wizard::CloseDialog (); -- 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] r49622 - /trunk/installation/src/clients/inst_network_setup.ycp
by locilka＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: locilka Date: Mon Aug 4 12:59:16 2008 New Revision: 49622 URL: http://svn.opensuse.org/viewcvs/yast?rev=49622&view=rev Log: Allowing also IPv6 addresses Modified: trunk/installation/src/clients/inst_network_setup.ycp Modified: trunk/installation/src/clients/inst_network_setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_ne… ============================================================================== --- trunk/installation/src/clients/inst_network_setup.ycp (original) +++ trunk/installation/src/clients/inst_network_setup.ycp Mon Aug 4 12:59:16 2008 @@ -419,7 +419,7 @@ // TRANSLATORS: error message Report::Error (_("IP address cannot be empty.")); return false; - } else if (! IP::Check4 (ip_address)) { + } else if (! IP::Check4 (ip_address) && ! IP::Check6 (ip_address)) { UI::SetFocus (`id ("ip_address")); Report::Error (sformat ( // TRANSLATORS: Error message, %1 is replaced with invalid IP address @@ -451,7 +451,7 @@ // TRANSLATORS: error message Report::Error (_("Gateway IP address cannot be empty.")); return false; - } else if (! IP::Check4 (gateway)) { + } else if (! IP::Check4 (gateway) && ! IP::Check6 (gateway)) { UI::SetFocus (`id ("gateway")); Report::Error (sformat ( // TRANSLATORS: Error message, %1 is replaced with invalid IP address @@ -467,7 +467,7 @@ // TRANSLATORS: error message Report::Error (_("DNS server IP address cannot be empty.")); return false; - } else if (! IP::Check4 (dns_server)) { + } else if (! IP::Check4 (dns_server) && ! IP::Check6 (dns_server)) { UI::SetFocus (`id ("dns_server")); Report::Error (sformat ( // TRANSLATORS: Error message, %1 is replaced with invalid IP address @@ -505,7 +505,7 @@ // TRANSLATORS: error message Report::Error (_("Proxy server name or IP address must be set.")); return false; - } else if (! IP::Check4 (proxy_server) && ! Hostname::CheckFQ (proxy_server)) { + } else if (! IP::Check4 (proxy_server) && ! IP::Check6 (proxy_server) && ! Hostname::CheckFQ (proxy_server)) { UI::SetFocus (`id ("proxy_server")); Report::Error (sformat ( // TRANSLATORS: Error message, %1 is replaced with invalid IP address -- 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] r49621 - /trunk/storage/storage/src/include/ep-main.ycp
by aschnell＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: aschnell Date: Mon Aug 4 12:30:07 2008 New Revision: 49621 URL: http://svn.opensuse.org/viewcvs/yast?rev=49621&view=rev Log: - changed ordering Modified: trunk/storage/storage/src/include/ep-main.ycp Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-m… ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Mon Aug 4 12:30:07 2008 @@ -162,8 +162,8 @@ // TODO: same ordering as with IterateTargetMap tree = [ `item(`id(`all), `icon(all_icon), short_hostname, open(`all), [ `item(`id(`hd), `icon(hd_icon), _("Hard Disks"), open(`hd), subtree[`hd]:[]), - `item(`id(`lvm), `icon(lvm_icon), _("Volume Management"), open(`lvm), subtree[`lvm]:[]), `item(`id(`md), `icon(raid_icon), _("RAID"), open(`md), subtree[`md]:[]), + `item(`id(`lvm), `icon(lvm_icon), _("Volume Management"), open(`lvm), subtree[`lvm]:[]), `item(`id(`loop), `icon(loop_icon), _("Crypt Files"), open(`loop), subtree[`loop]:[]), `item(`id(`dm), `icon(dm_icon), _("Device Mapper"), open(`dm), subtree[`dm]:[]), `item(`id(`nfs), `icon(nfs_icon), _("NFS"), open(`nfs), subtree[`nfs]:[]), -- 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] r49620 - in /trunk/packager: package/yast2-packager.changes src/clients/inst_productsources.ycp
by locilka＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: locilka Date: Mon Aug 4 11:53:23 2008 New Revision: 49620 URL: http://svn.opensuse.org/viewcvs/yast?rev=49620&view=rev Log: - Community Repositories: listing recommended repositories first then sorting alphabetically (bnc #399998). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_productsources.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Aug 4 11:53:23 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 4 11:51:28 CEST 2008 - locilka(a)suse.cz + +- Community Repositories: listing recommended repositories first + then sorting alphabetically (bnc #399998). + +------------------------------------------------------------------- Wed Jul 30 09:36:40 CEST 2008 - lslezak(a)suse.cz - display autorefresh column in the repository config module Modified: trunk/packager/src/clients/inst_productsources.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_produc… ============================================================================== --- trunk/packager/src/clients/inst_productsources.ycp (original) +++ trunk/packager/src/clients/inst_productsources.ycp Mon Aug 4 11:53:23 2008 @@ -922,12 +922,12 @@ // preselect recommended repositories... // always fill-up this list -- later used for sorting using 'recommended' tag // Bugzilla #297628 - if (Stage::initial()) { + //if (Stage::initial()) { recommended = one_repo["recommended"]:false; if (recommended) { recommended_items = add (recommended_items, repo_id); } - } + //} // // was 'current' and remains 'current' // if (repo_id == current_item) @@ -964,11 +964,11 @@ } // In the initial stage, repos are additionally sorted whether they are recommended or not - if (Stage::initial()) { +// if (Stage::initial()) { items = sort (term one_item_a, term one_item_b, items, ``( contains (recommended_items, one_item_a[0,0]:"") > contains (recommended_items, one_item_b[0,0]:"") )); - } +// } UI::ChangeWidget (`id ("addon_repos"), `Items, items); -- 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] r49619 - /trunk/http-server/src/http-server.ycp
by mzugec＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: mzugec Date: Mon Aug 4 11:52:14 2008 New Revision: 49619 URL: http://svn.opensuse.org/viewcvs/yast?rev=49619&view=rev Log: fixed text for translation Modified: trunk/http-server/src/http-server.ycp Modified: trunk/http-server/src/http-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/http-server.ycp?… ============================================================================== --- trunk/http-server/src/http-server.ycp (original) +++ trunk/http-server/src/http-server.ycp Mon Aug 4 11:52:14 2008 @@ -185,7 +185,7 @@ //FIXME: check, if new address and port are correct values (if address is from machine's interfaces) if (size(address)>0 && !contains(maplist( string ip, string dev, HttpServer::ip2device, ``( ip )), address)) { - Report::Error(_("Can use only exsisting interfaces")); + Report::Error(_("Can use only existing interfaces")); return false; } if (finded) -- 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] r49618 - /trunk/storage/libstorage/examples/
by aschnell＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: aschnell Date: Mon Aug 4 11:40:35 2008 New Revision: 49618 URL: http://svn.opensuse.org/viewcvs/yast?rev=49618&view=rev Log: - updated ignores Modified: trunk/storage/libstorage/examples/ (props changed) -- 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] r49617 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: aschnell Date: Mon Aug 4 11:39:31 2008 New Revision: 49617 URL: http://svn.opensuse.org/viewcvs/yast?rev=49617&view=rev Log: - fixed handling of renamed devices during update (bnc #392086) 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.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Aug 4 11:39:31 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Aug 04 11:37:49 CEST 2008 - aschnell(a)suse.de + +- fixed handling of renamed devices during update (bnc #392086) + +------------------------------------------------------------------- Sun Aug 03 16:01:46 CEST 2008 - aschnell(a)suse.de - implemented global lock for libstorage (fate #302971) Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Aug 4 11:39:31 2008 @@ -210,6 +210,14 @@ return( ret ); }; + +global boolean IsKernelDeviceName(string device) +{ + return substring(device, 0, 6) != "LABEL=" && + substring(device, 0, 5) != "UUID=" && + substring(device, 0, 13) != "/dev/disk/by-"; +} + /** * Returns ... * @@ -5703,11 +5711,14 @@ global string HdDiskMap( string input, map diskmap ) ``{ string ret = input; - map d = GetDiskPartition( input ); - if( haskey( diskmap, d["disk"]:"" )) + if (IsKernelDeviceName(input)) + { + map d = GetDiskPartition( input ); + if( haskey( diskmap, d["disk"]:"" )) { - ret = GetDeviceName( diskmap[d["disk"]:""]:"", d["nr"]:(any)0 ); + ret = GetDeviceName( diskmap[d["disk"]:""]:"", d["nr"]:(any)0 ); } + } y2milestone( "HdDiskMap input:%1 ret:%2", input, ret ); return( ret ); } @@ -7133,14 +7144,6 @@ } -global boolean IsKernelDeviceName(string device) -{ - return substring(device, 0, 6) != "LABEL=" && - substring(device, 0, 5) != "UUID=" && - substring(device, 0, 13) != "/dev/disk/by-"; -} - - global boolean DeviceMatchFstab( string device, string fstab_spec ) { boolean ret = false; -- 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] r49616 - in /trunk/installation: control/control.SLES.xml package/yast2-installation.changes
by locilka＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: locilka Date: Mon Aug 4 10:40:19 2008 New Revision: 49616 URL: http://svn.opensuse.org/viewcvs/yast?rev=49616&view=rev Log: - Added kdump proposal to SLES control file (FATE #303893). Modified: trunk/installation/control/control.SLES.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Mon Aug 4 10:40:19 2008 @@ -157,7 +157,9 @@ <proposal_module>timezone</proposal_module> <proposal_module>language</proposal_module> <proposal_module>runlevel</proposal_module> + <proposal_module>kdump</proposal_module> </proposal_modules> + <proposal_tabs config:type="list"> <proposal_tab> <label>Overview</label> @@ -168,6 +170,7 @@ <proposal_module>language_simple</proposal_module> </proposal_modules> </proposal_tab> + <proposal_tab> <label>Expert</label> <proposal_modules config:type="list"> @@ -181,6 +184,7 @@ <proposal_module>timezone</proposal_module> <proposal_module>language</proposal_module> <proposal_module>runlevel</proposal_module> + <proposal_module>kdump</proposal_module> </proposal_modules> </proposal_tab> </proposal_tabs> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Aug 4 10:40:19 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Aug 4 10:39:41 CEST 2008 - locilka(a)suse.cz + +- Added kdump proposal to SLES control file (FATE #303893). + +------------------------------------------------------------------- Thu Jul 24 13:21:14 CEST 2008 - locilka(a)suse.cz - Using button label "License Translations..." in complex welcome -- 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] r49615 - /trunk/http-server/src/http-server.ycp
by mzugec＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: mzugec Date: Mon Aug 4 10:32:10 2008 New Revision: 49615 URL: http://svn.opensuse.org/viewcvs/yast?rev=49615&view=rev Log: fixed minor typo Modified: trunk/http-server/src/http-server.ycp Modified: trunk/http-server/src/http-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/http-server.ycp?… ============================================================================== --- trunk/http-server/src/http-server.ycp (original) +++ trunk/http-server/src/http-server.ycp Mon Aug 4 10:32:10 2008 @@ -185,7 +185,7 @@ //FIXME: check, if new address and port are correct values (if address is from machine's interfaces) if (size(address)>0 && !contains(maplist( string ip, string dev, HttpServer::ip2device, ``( ip )), address)) { - Report::Error(_("Can use only exsists interfaces")); + Report::Error(_("Can use only exsisting interfaces")); return false; } if (finded) -- 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] r49614 - /tags/stable-2_17_3/users/
by jsuchome＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: jsuchome Date: Mon Aug 4 09:05:59 2008 New Revision: 49614 URL: http://svn.opensuse.org/viewcvs/yast?rev=49614&view=rev Log: Created tag stable-2_17_3 for users Added: tags/stable-2_17_3/users/ - copied from r49613, trunk/users/ -- 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] r49613 - in /trunk/users: VERSION package/yast2-users.changes src/dialogs.ycp src/helps.ycp yast2-users.spec.in
by jsuchome＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: jsuchome Date: Mon Aug 4 08:31:03 2008 New Revision: 49613 URL: http://svn.opensuse.org/viewcvs/yast?rev=49613&view=rev Log: - checkbox to force a change of password (bnc#368613) - 2.17.3 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/dialogs.ycp trunk/users/src/helps.ycp trunk/users/yast2-users.spec.in Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=49613&r1=49612… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Mon Aug 4 08:31:03 2008 @@ -1 +1 @@ -2.17.2 +2.17.3 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Mon Aug 4 08:31:03 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 24 15:42:24 CEST 2008 - jsuchome(a)suse.cz + +- checkbox to force a change of password (bnc#368613) +- 2.17.3 + +------------------------------------------------------------------- Mon Jul 21 14:13:56 CEST 2008 - jsuchome(a)suse.cz - do not lowecase LDAP object names (fate#303596): Modified: trunk/users/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/dialogs.ycp?rev=49613&… ============================================================================== --- trunk/users/src/dialogs.ycp (original) +++ trunk/users/src/dialogs.ycp Mon Aug 4 08:31:03 2008 @@ -622,6 +622,7 @@ define term get_password_term () { string last_change = GetString (user["shadowLastChange"]:nil, "0"); + string last_change_label= ""; string expires = GetString (user["shadowExpire"]:nil, "0"); if (expires == "") expires = "0"; @@ -635,12 +636,12 @@ { map out = (map)SCR::Execute (.target.bash_output, sformat ("date --date='1970-01-01 00:00:01 %1 days' +\"%%x\"", last_change)); // label (date of last password change) - last_change = out["stdout"]:_("Unknown"); + last_change_label = out["stdout"]:_("Unknown"); } else { // label (date of last password change) - last_change = _("Never"); + last_change_label = _("Never"); } if (expires != "0" && expires != "-1" && expires != "") { @@ -656,7 +657,13 @@ `HSquash(`VBox( `Left (`Label (sformat ( // label - _("Last Password Change: %1"), last_change ))), + _("Last Password Change: %1"), last_change_label ))), + `VSpacing (0.2), + `Left ( + // check box label + `CheckBox (`id (`force_pw), _("Force Password Change"), + last_change == "0") + ), `VSpacing (1), `IntField (`id ("shadowWarning"), // intfield label @@ -1480,6 +1487,11 @@ } } } + if (UI::QueryWidget (`id (`force_pw), `Value) == true) + { + // force password change + user["shadowLastChange"] = "0"; + } } // inside plugins dialog @@ -1668,6 +1680,11 @@ if (ret == `passwordsettings) { UI::ReplaceWidget(`tabContents, get_password_term ()); + if (GetString (user["shadowLastChange"]:nil, "0") == "0") + { + // forcing password change cannot be undone + UI::ChangeWidget (`id (`force_pw), `Enabled, false); + } Wizard::SetHelpText (EditUserPasswordDialogHelp()); current = ret; } Modified: trunk/users/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/helps.ycp?rev=49613&r1… ============================================================================== --- trunk/users/src/helps.ycp (original) +++ trunk/users/src/helps.ycp Mon Aug 4 08:31:03 2008 @@ -470,8 +470,11 @@ * @return string help text */ define string EditUserPasswordDialogHelp() ``{ -// Help text 1/5 - return _(" + // Help text 1/6 + return _("Activate Force Password Change to force user to change the password at the next login. If Last Password Change is set to Never, user will be forced to change the password.") + + +// Help text 2/6 +_(" Days before Password Expiration to Issue Warning Users can be warned before their passwords expire. Set how long before expiration the warning should be issued. Set -1 to disable @@ -479,24 +482,24 @@ ") + -// Help text 2/5 +// Help text 3/6 _("Days after Password Expires with Usable Login Users can log in after their passwords have expired. Set how many days to allow login. Use -1 for unlimited access. ") + -//Help text 3/5 +//Help text 4/6 _("Maximum Number of Days for the Same Password Set how many days a user can use the same password before it expires. ") + -// Help text 4/5 +// Help text 5/6 _("Minimum Number of Days for the Same Password Set the minimum age of a password before a user is allowed to change it. ") + -// Help text 5/5 : Don't reorder letters YYYY-MM-DD, date must be set in this format +// Help text 6/6 : Don't reorder letters YYYY-MM-DD, date must be set in this format _("Expiration Date Set the date when this account expires. The date must be in the format YYYY-MM-DD. Leave it empty if this account never expires. Modified: trunk/users/yast2-users.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/yast2-users.spec.in?rev=49… ============================================================================== --- trunk/users/yast2-users.spec.in (original) +++ trunk/users/yast2-users.spec.in Mon Aug 4 08:31:03 2008 @@ -7,8 +7,8 @@ Obsoletes: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user Provides: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user -# LDAPInitWithTLSCheck -Requires: yast2-ldap-client >= 2.15.8 +# this forces using yast2-ldap with orrect LDAP object names (fate#303596) +Requires: yast2-ldap-client >= 2.17.1 # new ag_anyxml Requires: yast2 >= 2.16.40 -- 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] r49612 - in /trunk/storage/libstorage/src: Lock.cc Lock.h
by aschnell＠svn.opensuse.org 03 Aug '08

03 Aug '08

Author: aschnell Date: Mon Aug 4 00:12:41 2008 New Revision: 49612 URL: http://svn.opensuse.org/viewcvs/yast?rev=49612&view=rev Log: - a bit better disabling Modified: trunk/storage/libstorage/src/Lock.cc trunk/storage/libstorage/src/Lock.h Modified: trunk/storage/libstorage/src/Lock.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Lock.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Lock.cc (original) +++ trunk/storage/libstorage/src/Lock.cc Mon Aug 4 00:12:41 2008 @@ -30,9 +30,9 @@ Lock::Lock(bool readonly) - : fd(-1) + : fd(-1), disabled(getenv("YAST2_STORAGE_NO_LOCKING") != NULL) { - if (getenv("YAST2_STORAGE_NO_LOCKING") != NULL) + if (disabled) return; y2mil("getting " << (readonly ? "read-only" : "read-write") << " lock"); @@ -83,7 +83,7 @@ Lock::~Lock() throw() { - if (getenv("YAST2_STORAGE_NO_LOCKING") != NULL) + if (disabled) return; y2mil("releasing lock"); Modified: trunk/storage/libstorage/src/Lock.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Lock.h?re… ============================================================================== --- trunk/storage/libstorage/src/Lock.h (original) +++ trunk/storage/libstorage/src/Lock.h Mon Aug 4 00:12:41 2008 @@ -44,6 +44,7 @@ private: int fd; + bool disabled; }; } -- 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] r49611 - in /trunk/storage: libstorage/src/Lock.cc libstorage/src/StorageInterface.h libstorage/testsuite/lib/limal_init.exp yast2-storage.spec.in
by aschnell＠svn.opensuse.org 03 Aug '08

03 Aug '08

Author: aschnell Date: Sun Aug 3 23:42:15 2008 New Revision: 49611 URL: http://svn.opensuse.org/viewcvs/yast?rev=49611&view=rev Log: - finished locking support Modified: trunk/storage/libstorage/src/Lock.cc trunk/storage/libstorage/src/StorageInterface.h trunk/storage/libstorage/testsuite/lib/limal_init.exp trunk/storage/yast2-storage.spec.in Modified: trunk/storage/libstorage/src/Lock.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Lock.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Lock.cc (original) +++ trunk/storage/libstorage/src/Lock.cc Sun Aug 3 23:42:15 2008 @@ -9,6 +9,7 @@ #include <string.h> #include <errno.h> #include <sys/types.h> +#include <stdlib.h> #include "y2storage/AppUtil.h" #include "y2storage/Lock.h" @@ -31,16 +32,19 @@ Lock::Lock(bool readonly) : fd(-1) { + if (getenv("YAST2_STORAGE_NO_LOCKING") != NULL) + return; + y2mil("getting " << (readonly ? "read-only" : "read-write") << " lock"); - if (mkdir("/var/lock/libstorage", 0622) < 0) + if (mkdir("/var/lock/libstorage", 0755) < 0) { - // Creating directory failed. Not fatal (should already exist). + // Creating directory failed. Not fatal (it should already exist). y2deb("creating directory for lock-file failed: " << strerror(errno)); } fd = open("/var/lock/libstorage/lock", (readonly ? O_RDONLY : O_WRONLY) | O_CREAT, - S_IRUSR | S_IWUSR); + S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); if (fd < 0) { // Opening lock-file failed. @@ -79,11 +83,14 @@ Lock::~Lock() throw() { + if (getenv("YAST2_STORAGE_NO_LOCKING") != NULL) + return; + y2mil("releasing lock"); close(fd); - // Do not bother deleting lock-file. This is difficult if there are - // several read-only locks. + // Do not bother deleting lock-file. Likelihood of race conditions is + // to high. } } Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Sun Aug 3 23:42:15 2008 @@ -56,6 +56,8 @@ * * The support for multiple read-only locks is experimental. * + * Locking may also fail for other reasons, e.g. limited permissions. + * * \section Example * * Here is a simple example to demonstrate the usage of libstorage: Modified: trunk/storage/libstorage/testsuite/lib/limal_init.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/lib… ============================================================================== --- trunk/storage/libstorage/testsuite/lib/limal_init.exp (original) +++ trunk/storage/libstorage/testsuite/lib/limal_init.exp Sun Aug 3 23:42:15 2008 @@ -30,7 +30,7 @@ puts "Running $base_name..." - #generate output directory + # generate output directory exec mkdir -p ./single.out/out set outfile ./single.out/out/$base_name.out @@ -40,6 +40,8 @@ # run the test + setenv YAST2_STORAGE_NO_LOCKING + set result "" set oops [catch { set result [exec $src >$outfile 2>$errfile] } catched] Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Sun Aug 3 23:42:15 2008 @@ -33,6 +33,7 @@ @INSTALL@ rm -f $RPM_BUILD_ROOT/@plugindir@/libpy2StorageCallbacks.la rm -f $RPM_BUILD_ROOT/@plugindir@/libpy2StorageCallbacks.so +install -d -m 755 $RPM_BUILD_ROOT/var/lock/libstorage @CLEAN@ @@ -93,6 +94,7 @@ %files lib %defattr(-,root,root) %{_libdir}/liby2storage.so.* +%dir /var/lock/libstorage %post lib /sbin/ldconfig -- 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] r49610 - /trunk/storage/libstorage/src/Lock.cc
by aschnell＠svn.opensuse.org 03 Aug '08

03 Aug '08

Author: aschnell Date: Sun Aug 3 19:40:59 2008 New Revision: 49610 URL: http://svn.opensuse.org/viewcvs/yast?rev=49610&view=rev Log: - better location for lock-file Modified: trunk/storage/libstorage/src/Lock.cc Modified: trunk/storage/libstorage/src/Lock.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Lock.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Lock.cc (original) +++ trunk/storage/libstorage/src/Lock.cc Sun Aug 3 19:40:59 2008 @@ -33,8 +33,13 @@ { y2mil("getting " << (readonly ? "read-only" : "read-write") << " lock"); - // TODO filename - fd = open("/tmp/lock-test", (readonly ? O_RDONLY : O_WRONLY) | O_CREAT, + if (mkdir("/var/lock/libstorage", 0622) < 0) + { + // Creating directory failed. Not fatal (should already exist). + y2deb("creating directory for lock-file failed: " << strerror(errno)); + } + + fd = open("/var/lock/libstorage/lock", (readonly ? O_RDONLY : O_WRONLY) | O_CREAT, S_IRUSR | S_IWUSR); if (fd < 0) { @@ -76,6 +81,9 @@ { y2mil("releasing lock"); close(fd); + + // Do not bother deleting lock-file. This is difficult if there are + // several read-only locks. } } -- 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] r49609 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 03 Aug '08

03 Aug '08

Author: aschnell Date: Sun Aug 3 19:13:24 2008 New Revision: 49609 URL: http://svn.opensuse.org/viewcvs/yast?rev=49609&view=rev Log: - show locker pid and name Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Sun Aug 3 19:13:24 2008 @@ -282,22 +282,49 @@ list<map> conts = []; +string GetProcessName(integer pid) +{ + string name = (string) SCR::Read(.target.symlink, "/proc/" + tostring(pid) + "/exe"); + if (name == nil) + return nil; + + integer pos = findlastof(name, "/"); + if (pos == nil) + return name; + + return substring(name, pos + 1); +} + + any CreateInterface(boolean readonly) { while (sint == nil) { integer locker_pid = 0; sint = LibStorage::createStorageInterfacePid(readonly, Mode::test(), true, locker_pid); - y2milestone("sint:%1", sint); if (sint == nil) { - y2milestone("locker_pid:%1", locker_pid); + string locker_name = GetProcessName(locker_pid); + y2milestone("locker_pid:%1 locker_name:%2", locker_pid, locker_name); - // TODO - - if (!Popup::YesNo("Retry TODO")) - break; + if (locker_name == nil) + { + if (!Popup::AnyQuestion(Label::ErrorMsg(), + _("The storage subsystem is locked by an unknown application. +You must quit that application before you can continue."), Label::ContinueButton(), + Label::CancelButton(), `focus_no)) + break; + } + else + { + if (!Popup::AnyQuestion(Label::ErrorMsg(), + sformat(_("The storage subsystem is locked by the application \"%1\" (%2). +You must quit that application before you can continue."), locker_name, locker_pid), + Label::ContinueButton(), Label::CancelButton(), + `focus_no)) + break; + } } } -- 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] r49608 - /trunk/storage/storage/src/modules/Partitions.ycp
by aschnell＠svn.opensuse.org 03 Aug '08

03 Aug '08

Author: aschnell Date: Sun Aug 3 17:56:36 2008 New Revision: 49608 URL: http://svn.opensuse.org/viewcvs/yast?rev=49608&view=rev Log: - stricter type Modified: trunk/storage/storage/src/modules/Partitions.ycp Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Sun Aug 3 17:56:36 2008 @@ -60,27 +60,26 @@ global string nfs_name = "NFS"; // filesystems for /win - /* FAT32, Win95-Fat32, Win95LBA, Win95-Fat16 */ - global list fsid_wintypes = [ 6, 11, 12, 14 ]; + global const list<integer> fsid_wintypes = [ 6, 11, 12, 14 ]; /* FAT32, Win95-Fat32, Win95LBA, Win95-Fat16 */ // filesystems for /dos - global list fsid_dostypes = [ 1, 4 ]; /* FAT12, FAT16 */ + global const list<integer> fsid_dostypes = [ 1, 4 ]; /* FAT12, FAT16 */ // filesystems for /windows - global list fsid_ntfstypes = [ 7, 23 ]; /* NTFS */ + global const list<integer> fsid_ntfstypes = [ 7, 23 ]; /* NTFS */ // filesystems mounted read-only - global list fsid_readonly = [ 7, 23 ]; + global const list<integer> fsid_readonly = [ 7, 23 ]; // filesystems skipped on sparc and axp - global list fsid_skipped = [ 0, 5 ]; + global const list<integer> fsid_skipped = [ 0, 5 ]; // partition ids not to delete when suggesting to use whole disk - global list do_not_delete = [ 0x12, 0xde, fsid_mac_hfs, fsid_gpt_service ]; + global const list<integer> do_not_delete = [ 0x12, 0xde, fsid_mac_hfs, fsid_gpt_service ]; // partition ids not to display as windows when fat32 is on it - global list no_windows = [ 0x12, 0x82, 0xde, fsid_gpt_boot, fsid_gpt_service, - fsid_gpt_msftres ]; + global const list<integer> no_windows = [ 0x12, 0x82, 0xde, fsid_gpt_boot, fsid_gpt_service, + fsid_gpt_msftres ]; global integer minimal_needed_disksize = 400 * 1024 * 1024; // for installation of a minimal system integer minimal_needed_bootsize = 0; -- 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] r49607 - /trunk/storage/libstorage/src/StorageInterface.h
by aschnell＠svn.opensuse.org 03 Aug '08

03 Aug '08

Author: aschnell Date: Sun Aug 3 16:42:09 2008 New Revision: 49607 URL: http://svn.opensuse.org/viewcvs/yast?rev=49607&view=rev Log: - added note Modified: trunk/storage/libstorage/src/StorageInterface.h Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Sun Aug 3 16:42:09 2008 @@ -54,6 +54,8 @@ * read-write lock. An read-write lock excludes all other locks, both * read-only and read-write. * + * The support for multiple read-only locks is experimental. + * * \section Example * * Here is a simple example to demonstrate the usage of libstorage: -- 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] r49606 - in /trunk/gtk: ChangeLog src/YGPackageSelector.cc src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 03 Aug '08

03 Aug '08

Author: rpmcruz Date: Sun Aug 3 16:38:16 2008 New Revision: 49606 URL: http://svn.opensuse.org/viewcvs/yast?rev=49606&view=rev Log: * src/yzyppwrapper.cc: translate patch severities. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=49606&r1=49605… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sun Aug 3 16:38:16 2008 @@ -1,3 +1,7 @@ +2008-08-03 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/yzyppwrapper.cc: translate patch severities. + 2008-08-02 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGUtils.cc & src/ygtkrichtext.c: fixed some glitches left from Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Sun Aug 3 16:38:16 2008 @@ -1475,7 +1475,7 @@ m_type = gtk_combo_box_new_text(); if (updateMode) - gtk_combo_box_append_text (GTK_COMBO_BOX (m_type), _("Patches")); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_type), _("Severity")); else { gtk_combo_box_append_text (GTK_COMBO_BOX (m_type), _("Groups")); gtk_combo_box_append_text (GTK_COMBO_BOX (m_type), _("Patterns")); Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=4960… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Sun Aug 3 16:38:16 2008 @@ -1422,9 +1422,23 @@ } }; + std::string category = category_str; + if (type == Package::PATCH_TYPE) { + if (category_str == "security") + category = _("Security"); + else if (category_str == "recommended") + category = _("Recommended"); + else if (category_str == "optional") + category = _("Optional"); + else if (category_str == "yast") + category = "YaST"; + else if (category_str == "document") + category = _("Documentation"); + } + if (!categories[type]) categories[type] = new StringTree (inner::cmp, '/'); - return categories[type]->add (category_str, 0); + return categories[type]->add (category, 0); } Ypp::Node *Ypp::Impl::addCategory2 (Ypp::Package::Type type, const std::string &category_str) -- 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] r49605 - /trunk/storage/libstorage/src/StorageInterface.h
by aschnell＠svn.opensuse.org 03 Aug '08

03 Aug '08

Author: aschnell Date: Sun Aug 3 16:36:42 2008 New Revision: 49605 URL: http://svn.opensuse.org/viewcvs/yast?rev=49605&view=rev Log: - added documentation Modified: trunk/storage/libstorage/src/StorageInterface.h Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Sun Aug 3 16:36:42 2008 @@ -42,6 +42,18 @@ * queried with \link storage::StorageInterface::isCacheChanges() * isCacheChanges()\endlink. * + * \section Locking + * + * During initialisation libstorage installs a global lock so that several + * programs trying to use libstorage at the same time do not interfere. This + * lock is either read-only or read-write depending on the readonly parameter + * used in \link storage::StorageInterface::createStorageInterface() + * createStorageInterface() \endlink. + * + * Several processes may hold a read-lock, but only one process may hold a + * read-write lock. An read-write lock excludes all other locks, both + * read-only and read-write. + * * \section Example * * Here is a simple example to demonstrate the usage of libstorage: -- 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] r49604 - in /trunk/storage: ./ disk/src/ libstorage/examples/ libstorage/src/ package/ storage/src/modules/
by aschnell＠svn.opensuse.org 03 Aug '08

03 Aug '08

Author: aschnell Date: Sun Aug 3 16:09:24 2008 New Revision: 49604 URL: http://svn.opensuse.org/viewcvs/yast?rev=49604&view=rev Log: - implemented global lock for libstorage (fate #302971) Added: trunk/storage/libstorage/examples/TestLock.cc trunk/storage/libstorage/src/Lock.cc trunk/storage/libstorage/src/Lock.h Modified: trunk/storage/VERSION trunk/storage/disk/src/disk_worker.ycp trunk/storage/libstorage/examples/Makefile.am trunk/storage/libstorage/examples/Makefile.example trunk/storage/libstorage/src/Makefile.am trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/StorageInterface.h trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=49604&r1=496… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Sun Aug 3 16:09:24 2008 @@ -1 +1 @@ -2.17.8 +2.17.9 Modified: trunk/storage/disk/src/disk_worker.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/disk/src/disk_worker.ycp… ============================================================================== --- trunk/storage/disk/src/disk_worker.ycp (original) +++ trunk/storage/disk/src/disk_worker.ycp Sun Aug 3 16:09:24 2008 @@ -25,6 +25,9 @@ any DiskSequence() { + if (!Storage::InitLibstorage(false)) + return `abort; + Storage::SwitchUiAutomounter(false); any ret = WFM::CallFunction("inst_disk", [ true, true ]); Storage::SwitchUiAutomounter(true); Modified: trunk/storage/libstorage/examples/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Make… ============================================================================== --- trunk/storage/libstorage/examples/Makefile.am (original) +++ trunk/storage/libstorage/examples/Makefile.am Sun Aug 3 16:09:24 2008 @@ -9,7 +9,7 @@ AM_CXXFLAGS = -noinst_PROGRAMS = TestDisk TestDiskLog TestStorage TestProbing TestLvm TestMd TestLoop +noinst_PROGRAMS = TestDisk TestDiskLog TestStorage TestProbing TestLvm TestMd TestLoop TestLock TestDisk_SOURCES = TestDisk.cc @@ -25,6 +25,8 @@ TestLoop_SOURCES = TestLoop.cc +TestLock_SOURCES = TestLock.cc + exampledir = $(docdir)/examples/libstorage example_DATA = TestDisk.cc TestDiskLog.cc TestProbing.cc TestLvm.cc TestMd.cc TestLoop.cc Modified: trunk/storage/libstorage/examples/Makefile.example URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Make… ============================================================================== --- trunk/storage/libstorage/examples/Makefile.example (original) +++ trunk/storage/libstorage/examples/Makefile.example Sun Aug 3 16:09:24 2008 @@ -1,9 +1,9 @@ -CXXFLAGS=-MMD -g -I /usr/include/YaST2 +CXXFLAGS = -MMD -g -I /usr/include/YaST2 LDFLAGS = -ly2storage -PROG=TestDisk TestDiskLog TestProbing TestLvm TestMd TestLoop +PROGRAMS = TestDisk TestDiskLog TestProbing TestLvm TestMd TestLoop -all: $(PROG) +all: $(PROGRAMS) TestDisk: TestDisk.o @@ -18,7 +18,7 @@ TestLoop: TestLoop.o clean: - rm -f *.d *.o $(PROG) + rm -f *.d *.o $(PROGRAMS) ifneq "$(strip $(wildcard *.d))" "" include $(wildcard *.d) Added: trunk/storage/libstorage/examples/TestLock.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Test… ============================================================================== --- trunk/storage/libstorage/examples/TestLock.cc (added) +++ trunk/storage/libstorage/examples/TestLock.cc Sun Aug 3 16:09:24 2008 @@ -0,0 +1,128 @@ +/* + * Author: Arvin Schnell <aschnell(a)suse.de> + */ + + +#include <getopt.h> +#include <iostream> + +#include <y2storage/Lock.h> +#include <y2storage/Storage.h> + +using namespace std; +using namespace storage; + + +const char* program_name; + + +void help() __attribute__ ((__noreturn__)); + +void +help() +{ + cout << "Usage: " << program_name << " [OPTION]..." << endl + << endl + << "Mandatory arguments to long options are mandatory for short options too." << endl + << " -r, --rd get read-only lock (default)" << endl + << " -w, --wr get read-write lock" << endl + << endl + << " -s, --sleep=SECONDS sleep for SECONDS seconds after getting lock (30 seconds default)" << endl + << endl + << " -h, --help show this help" << endl; + + exit(EXIT_SUCCESS); +} + + +void usage() __attribute__ ((__noreturn__)); + +void +usage() +{ + cerr << "Try " << program_name << " --help for more information." << endl; + exit(EXIT_FAILURE); +} + + +int +main(int argc, char** argv) +{ + program_name = argv[0]; + + bool readonly = true; + int sleep = 30; + + struct option long_options[] = { + { "rd", 0, 0, 'r' }, + { "wr", 0, 0, 'w' }, + { "sleep", 1, 0, 's' }, + { "help", 0, 0, 'h' }, + { 0, 0, 0, 0 } + }; + + while (true) + { + int c = getopt_long(argc, argv, "rws:h", long_options, 0); + if (c == -1) + break; + + switch (c) + { + case 'r': + readonly = true; + break; + + case 'w': + readonly = false; + break; + + case 's': + sleep = atoi(optarg); + break; + + case 'h': + help(); + + default: + usage(); + } + } + + if (optind < argc) + { + cerr << program_name << ": unrecognized option '" << argv[optind] << "'" << endl; + usage(); + } + + Storage::initDefaultLogger(); + + cout << "pid is " << getpid() << endl; + + Lock* lock = NULL; + + try + { + lock = new Lock(readonly); + } + catch (LockException& e) + { + cerr << "lock failed" << endl; + cerr << "locker-pid is " << e.GetLockerPid() << endl; + exit(EXIT_FAILURE); + } + + cout << "lock (" << (readonly ? "read-only" : "read-write") << ") succeeded" << endl; + + if (sleep > 0) + { + cout << "(sleeping for " << sleep << " seconds)" << endl; + ::sleep(sleep); + } + + cout << "releasing lock" << endl; + + delete lock; + + exit(EXIT_SUCCESS); +} Added: trunk/storage/libstorage/src/Lock.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Lock.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Lock.cc (added) +++ trunk/storage/libstorage/src/Lock.cc Sun Aug 3 16:09:24 2008 @@ -0,0 +1,81 @@ +/* + * Author: Arvin Schnell <aschnell(a)suse.de> + */ + + +#include <stdio.h> +#include <unistd.h> +#include <fcntl.h> +#include <string.h> +#include <errno.h> +#include <sys/types.h> + +#include "y2storage/AppUtil.h" +#include "y2storage/Lock.h" + + +namespace storage +{ + + LockException::LockException(pid_t locker_pid) + : locker_pid(locker_pid) + { + } + + + LockException::~LockException() throw() + { + } + + + Lock::Lock(bool readonly) + : fd(-1) + { + y2mil("getting " << (readonly ? "read-only" : "read-write") << " lock"); + + // TODO filename + fd = open("/tmp/lock-test", (readonly ? O_RDONLY : O_WRONLY) | O_CREAT, + S_IRUSR | S_IWUSR); + if (fd < 0) + { + // Opening lock-file failed. + y2err("opening lock-file failed: " << strerror(errno)); + throw(LockException(0)); + } + + struct flock lock; + memset(&lock, 0, sizeof(lock)); + lock.l_whence = SEEK_SET; + lock.l_type = (readonly ? F_RDLCK : F_WRLCK); + if (fcntl(fd, F_SETLK, &lock) < 0) + { + switch (errno) + { + case EACCES: + case EAGAIN: + // Another process has a lock. Between the two fcntl + // calls the lock of the other process could be + // release. In that case we don't get the pid (and it is + // still 0). + fcntl(fd, F_GETLK, &lock); + y2err("locked by process " << lock.l_pid); + throw(LockException(lock.l_pid)); + + default: + // Some other error. + y2err("getting lock failed: " << strerror(errno)); + throw(LockException(0)); + } + } + + y2mil("lock succeeded"); + } + + + Lock::~Lock() throw() + { + y2mil("releasing lock"); + close(fd); + } + +} Added: trunk/storage/libstorage/src/Lock.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Lock.h?re… ============================================================================== --- trunk/storage/libstorage/src/Lock.h (added) +++ trunk/storage/libstorage/src/Lock.h Sun Aug 3 16:09:24 2008 @@ -0,0 +1,52 @@ +#ifndef LOCK_H +#define LOCK_H + + +/* + * Author: Arvin Schnell <aschnell(a)suse.de> + */ + + +#include <stdexcept> +#include <boost/noncopyable.hpp> + + +namespace storage +{ + + class LockException : public std::exception + { + + public: + + LockException(pid_t locker_pid); + virtual ~LockException() throw(); + + pid_t GetLockerPid() const { return locker_pid; } + + protected: + + pid_t locker_pid; + + }; + + /** + * Implement a global read-only or read-write lock. + */ + class Lock : boost::noncopyable + { + + public: + + Lock(bool readonly); + ~Lock() throw(); + + private: + + int fd; + + }; +} + + +#endif Modified: trunk/storage/libstorage/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Makefile.… ============================================================================== --- trunk/storage/libstorage/src/Makefile.am (original) +++ trunk/storage/libstorage/src/Makefile.am Sun Aug 3 16:09:24 2008 @@ -55,6 +55,7 @@ ProcMounts.cc ProcMounts.h \ EtcFstab.cc EtcFstab.h \ AppUtil.cc AppUtil.h \ + Lock.cc Lock.h \ StorageTypes.cc StorageTypes.h \ FilterIterator.h ListListIterator.h \ DerefIterator.h IterPair.h \ Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Sun Aug 3 16:09:24 2008 @@ -73,9 +73,10 @@ } -Storage::Storage( bool ronly, bool tmode, bool autodetec ) : - readonly(ronly), testmode(tmode), initialized(false), autodetect(autodetec) - { +Storage::Storage( bool ronly, bool tmode, bool autodetec ) + : lock(ronly), readonly(ronly), testmode(tmode), initialized(false), + autodetect(autodetec) +{ y2milestone( "constructed Storage ronly:%d testmode:%d autodetect:%d", ronly, testmode, autodetect ); y2milestone( "package string \"%s\"", PACKAGE_STRING ); @@ -1046,6 +1047,27 @@ return new Storage (ronly, testmode, autodetect); } + StorageInterface* createStorageInterfacePid (bool ronly, bool testmode, bool autodetect, + pid_t& locker_pid) + { + try + { + return new Storage (ronly, testmode, autodetect); + } + catch (LockException& e) + { + locker_pid = e.GetLockerPid(); + y2mil("returning NULL"); + return NULL; + } + catch (...) + { + locker_pid = 0; + y2mil("returning NULL"); + return NULL; + } + } + void destroyStorageInterface (StorageInterface* p) { delete p; Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Sun Aug 3 16:09:24 2008 @@ -29,6 +29,7 @@ #include "y2storage/DerefIterator.h" #include "y2storage/ListListIterator.h" #include "y2storage/IterPair.h" +#include "y2storage/Lock.h" namespace storage { @@ -1720,6 +1721,7 @@ bool& resize_ok ); // protected internal member variables + Lock lock; bool readonly; bool testmode; bool inst_sys; Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Sun Aug 3 16:09:24 2008 @@ -2251,18 +2251,33 @@ /** * Factory for creating a concrete StorageInterface object. + * + * Throws an exception when locking fails. */ StorageInterface* createDefaultStorageInterface (); /** * Factory for creating a concrete StorageInterface object. + * + * Throws an exception when locking fails. */ StorageInterface* createStorageInterface (bool readonly, bool testmode, bool autodetect); /** + * Factory for creating a concrete StorageInterface object. + * + * Returns NULL if locking failed. In that case locker_pid is set to the + * pid of one process holding a conflicting lock. If the pid cannot be + * determined it is set to 0. The lock holder may run on another system. + */ + StorageInterface* createStorageInterfacePid (bool readonly, bool testmode, + bool autodetect, int& locker_pid); + + + /** * Destroy a StorageInterface object. */ void destroyStorageInterface (StorageInterface*); Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Sun Aug 3 16:09:24 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sun Aug 03 16:01:46 CEST 2008 - aschnell(a)suse.de + +- implemented global lock for libstorage (fate #302971) +- version 2.17.9 + +------------------------------------------------------------------- Fri Aug 01 10:42:52 CEST 2008 - aschnell(a)suse.de - redesigned expert partitioner (fate #302054) Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Sun Aug 3 16:09:24 2008 @@ -247,7 +247,6 @@ ] */ - global boolean ZeroNewPartitions = false; map StorageMap = $[]; map<integer,map> StorageMaps = $[]; @@ -282,40 +281,56 @@ any sint = nil; list<map> conts = []; -define any createInterface() + +any CreateInterface(boolean readonly) +{ + while (sint == nil) { - any ret = LibStorage::createStorageInterface(false, Mode::test(), true); - if( ZeroNewPartitions ) - LibStorage::StorageInterface::setZeroNewPartitions(ret,true); + integer locker_pid = 0; + sint = LibStorage::createStorageInterfacePid(readonly, Mode::test(), true, locker_pid); + y2milestone("sint:%1", sint); - return( ret ); + if (sint == nil) + { + y2milestone("locker_pid:%1", locker_pid); + + // TODO + + if (!Popup::YesNo("Retry TODO")) + break; + } } + y2milestone("sint:%1", sint); + return sint; +} + + list<map> getContainers(); -global define void InitLibstorage() +global boolean InitLibstorage(boolean readonly) +{ + if (sint != nil) + return true; + + y2milestone("InitLibstorage"); + sint = CreateInterface(readonly); + if (sint == nil) + return false; + + if (Stage::initial()) { - if( sint==nil ) - { - y2milestone( "InitLibstorage" ); - sint = createInterface(); - boolean evco = ProductFeatures::GetBooleanFeature( "partitioning", - "evms_config" ); - y2milestone( "InitLibstorage evco %1", evco ); - if( evco!=nil && !evco ) - LibStorage::StorageInterface::setNoEvms(sint,true); - if( Stage::initial() ) - { - LibStorage::StorageInterface::setDetectMountedVolumes(sint,false); - LibStorage::StorageInterface::setRootPrefix( sint, - Installation::destdir ); - } - conts = getContainers(); - y2milestone( "InitLibstorage conts:%1", conts ); - FileSystems::InitSlib( sint ); - } + LibStorage::StorageInterface::setDetectMountedVolumes(sint, false); + LibStorage::StorageInterface::setRootPrefix(sint, Installation::destdir); } + conts = getContainers(); + y2milestone("InitLibstorage conts:%1", conts); + FileSystems::InitSlib(sint); + + return true; +} + global string ByteToHumanString(integer bytes) { @@ -1296,7 +1311,8 @@ global define boolean CheckBackupState( string who ) { y2milestone( "CheckBackupStates who:%1", who ); - InitLibstorage(); + if (!InitLibstorage(false)) + return nil; boolean ret = LibStorage::StorageInterface::checkBackupState( sint, who ); y2milestone( "CheckBackupStates ret:%1", ret ); return( ret ); @@ -3674,7 +3690,8 @@ global void RemoveDmMapsTo( string device ) { y2milestone( "RemoveDmMapsTo device:%1", device ); - InitLibstorage(); + if (!InitLibstorage(false)) + return; LibStorage::StorageInterface::removeDmTableTo( sint, device ); } @@ -3742,11 +3759,13 @@ * ... ? * ] */ -global define map<string,map> GetTargetMap() - ``{ +global map<string,map> GetTargetMap() +{ + if (!InitLibstorage(false)) + return nil; + map<string,map> tmp = $[]; boolean changed = false; - InitLibstorage(); if( !probe_done && !Mode::config() ) { map<string,string> bios_id_raid = $[]; @@ -4054,17 +4073,20 @@ * * @see GetTargetMap(); */ -global define map<string,map> ReReadTargetMap() - ``{ - y2milestone("start reread sint:%1", sint ); +global map<string, map> ReReadTargetMap() +{ + boolean need_reread = sint != nil; + + if (!InitLibstorage(false)) + return nil; + + y2milestone("start reread need_reread:%1", need_reread); probe_done = false; - if( sint == nil ) - InitLibstorage(); - else - LibStorage::StorageInterface::rescanEverything( sint ); + if (need_reread) + LibStorage::StorageInterface::rescanEverything(sint); conts = getContainers(); return GetTargetMap(); - }; +} /** * Apply storage changes @@ -7009,11 +7031,12 @@ } global void DumpObjectList() - { - if( sint == nil ) - InitLibstorage(); +{ + if (!InitLibstorage(false)) + return; + LibStorage::StorageInterface::dumpObjectList(sint); - } +} global define list<string> NoProposeDisks() { @@ -7111,14 +7134,16 @@ } global string GetUsedFs() - { - InitLibstorage(); +{ + if (!InitLibstorage(false)) + return nil; + string r = LibStorage::StorageInterface::getAllUsedFs( sint ); list<string> lr = sort(splitstring(r," \t")); r = mergestring( lr, " " ); y2milestone( "GetUsedFs ret:%1", r ); return( r ); - } +} list FindUsedFsLine( map file ) { -- 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] r49603 - /trunk/storage/storage/src/modules/Partitions.ycp
by aschnell＠svn.opensuse.org 03 Aug '08

03 Aug '08

Author: aschnell Date: Sun Aug 3 13:17:13 2008 New Revision: 49603 URL: http://svn.opensuse.org/viewcvs/yast?rev=49603&view=rev Log: - use switch statement Modified: trunk/storage/storage/src/modules/Partitions.ycp Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Sun Aug 3 13:17:13 2008 @@ -1,9 +1,10 @@ /** - * Module: Partitions.ycp + * Module: Partitions.ycp * - * Authors: Thomas Fehr (fehr(a)suse.de) + * Authors: Thomas Fehr <fehr(a)suse.de> + * Arvin Schnell <aschnell(a)suse.de> * - * Purpose: Provides information about partitions + * Purpose: Provides information about partitions * * $Id$ */ @@ -18,33 +19,35 @@ import "AsciiFile"; import "String"; + // The filesystem ids for the partitions - global integer fsid_empty = 0; - global integer fsid_native = 131; - global integer fsid_swap = 130; - global integer fsid_lvm = 142; - global integer fsid_raid = 253; - global integer fsid_hibernation = 160; - global integer fsid_extended = 5; - global integer fsid_extended_win = 15; - global integer fsid_fat16 = 6; - global integer fsid_fat32 = 12; - global integer fsid_prep_chrp_boot = 0x41; - global integer fsid_mac_hidden = 0x101; - global integer fsid_mac_hfs = 0x102; - global integer fsid_mac_ufs = 0x106; - global integer fsid_gpt_boot = 0x103; - global integer fsid_gpt_service = 0x104; - global integer fsid_gpt_msftres = 0x105; - global integer fsid_freebsd = 0xa5; - global integer fsid_openbsd = 0xa6; - global integer fsid_netbsd = 0xa9; - global integer fsid_beos = 0xeb; - global integer fsid_solaris = 0xbf; - global integer fsid_root = fsid_native; - integer fsid_boot = 0; - integer boot_cyl = 0; - string boot_mount_point = ""; + global const integer fsid_empty = 0; + global const integer fsid_native = 131; + global const integer fsid_swap = 130; + global const integer fsid_lvm = 142; + global const integer fsid_raid = 253; + global const integer fsid_hibernation = 160; + global const integer fsid_extended = 5; + global const integer fsid_extended_win = 15; + global const integer fsid_fat16 = 6; + global const integer fsid_fat32 = 12; + global const integer fsid_prep_chrp_boot = 0x41; + global const integer fsid_mac_hidden = 0x101; + global const integer fsid_mac_hfs = 0x102; + global const integer fsid_mac_ufs = 0x106; + global const integer fsid_gpt_boot = 0x103; + global const integer fsid_gpt_service = 0x104; + global const integer fsid_gpt_msftres = 0x105; + global const integer fsid_freebsd = 0xa5; + global const integer fsid_openbsd = 0xa6; + global const integer fsid_netbsd = 0xa9; + global const integer fsid_beos = 0xeb; + global const integer fsid_solaris = 0xbf; + global const integer fsid_root = fsid_native; + + integer fsid_boot = 0; + integer boot_cyl = 0; + string boot_mount_point = ""; global boolean no_fsid_menu = Arch::s390 (); @@ -582,101 +585,106 @@ return( ret ); } -global define string FsIdToString( integer fs_id ) - ``{ - if ( fs_id == 0xa7) return( "NeXTSTEP"); - if ( fs_id == 0xb7) return( "BSDI fs"); - if ( fs_id == 0xb8) return( "BSDI swap"); - if ( fs_id == 0xc1) return( "DRDOS/sec"); - if ( fs_id == 0xc4) return( "DRDOS/sec"); - if ( fs_id == 0xc6) return( "DRDOS/sec"); - if ( fs_id == 0xc7) return( "Syrinx"); - if ( fs_id == 0xda) return( "Non-Fs data"); - if ( fs_id == 0xdb) return( "CP/M / CTOS"); - if ( fs_id == 0xde) return( "Dell Utility"); - if ( fs_id == 0xe1) return( "DOS access"); - if ( fs_id == 0xe3) return( "DOS R/O"); - if ( fs_id == 0xe4) return( "SpeedStor"); - if ( fs_id == 0xeb) return( "BeOS fs"); - if ( fs_id == 0xee) return( "EFI GPT"); - if ( fs_id == 0xef) return( "EFI (FAT-12/16)"); - if ( fs_id == 0xf1) return( "SpeedStor"); - if ( fs_id == 0xf4) return( "SpeedStor"); - if ( fs_id == 0xf2) return( "DOS secondary "); - if ( fs_id == 0xfd) return( "Linux RAID"); - if ( fs_id == 0xfe) return( "LANstep"); - if ( fs_id == 0xff) return( "BBT or NBO reserved"); - if ( fs_id == 0x0) return( "empty"); - if ( fs_id == 0x1) return( "FAT12"); - if ( fs_id == 0x2) return( "XENIX root"); - if ( fs_id == 0x3) return( "XENIX usr"); - if ( fs_id == 0x4) return( "FAT16 <32M"); - if ( fs_id == 0x5) return( "Extended"); - if ( fs_id == 0x6) return( "FAT16"); - if ( fs_id == 0x7) return( "HPFS/NTFS"); - if ( fs_id == 0x8) return( "AIX"); - if ( fs_id == 0x9) return( "AIX boot"); - if ( fs_id == 0xa) return( "OS/2 boot manager"); - if ( fs_id == 0xb) return( "Win95 FAT32"); - if ( fs_id == 0xc) return( "Win95 FAT32 LBA"); - if ( fs_id == 0xe) return( "Win95 FAT16"); - if ( fs_id == 0xf) return( "Extended"); - if ( fs_id == 0x10) return( "OPUS"); - if ( fs_id == 0x11) return( "Hidden FAT12"); - if ( fs_id == 0x12) return( "Vendor diag"); - if ( fs_id == 0x14) return( "Hidden FAT16"); - if ( fs_id == 0x16) return( "Hidden FAT16"); - if ( fs_id == 0x17) return( "Hidden HPFS/NTFS"); - if ( fs_id == 0x18) return( "AST Windows"); - if ( fs_id == 0x1b) return( "Hidden Win95"); - if ( fs_id == 0x1c) return( "Hidden Win95"); - if ( fs_id == 0x1e) return( "Hidden Win95"); - if ( fs_id == 0x24) return( "NEC DOS"); - if ( fs_id == 0x39) return( "Plan 9"); - if ( fs_id == 0x3c) return( "PartitionMagic"); - if ( fs_id == 0x40) return( "Venix 80286"); - if ( fs_id == 0x41) return( "PPC PReP Boot"); - if ( fs_id == 0x42) return( "SFS"); - if ( fs_id == 0x4d) return( "QNX4.x"); - if ( fs_id == 0x4e) return( "QNX4.x 2nd par"); - if ( fs_id == 0x4f) return( "QNX4.x 3rd par"); - if ( fs_id == 0x50) return( "OnTrack DM"); - if ( fs_id == 0x51) return( "OnTrack DM6"); - if ( fs_id == 0x52) return( "CP/M"); - if ( fs_id == 0x53) return( "OnTrack DM6"); - if ( fs_id == 0x54) return( "OnTrack DM6"); - if ( fs_id == 0x55) return( "EZ-Drive"); - if ( fs_id == 0x56) return( "Golden Bow"); - if ( fs_id == 0x5c) return( "Priam Edisk"); - if ( fs_id == 0x61) return( "SpeedStor"); - if ( fs_id == 0x63) return( "GNU HURD"); - if ( fs_id == 0x64) return( "Novell NetWare"); - if ( fs_id == 0x65) return( "Novell NetWare"); - if ( fs_id == 0x70) return( "DiskSecure"); - if ( fs_id == 0x75) return( "PC/IX"); - if ( fs_id == 0x80) return( "Old Minix"); - if ( fs_id == 0x81) return( "Minix"); - if ( fs_id == 0x82) return( "Linux swap"); - if ( fs_id == 0x83) return( "Linux native"); - if ( fs_id == 0x84) return( "OS/2 hidden"); - if ( fs_id == 0x85) return( "Linux extended"); - if ( fs_id == 0x86) return( "NTFS volume"); - if ( fs_id == 0x87) return( "NTFS volume"); - if ( fs_id == 0x8e) return( "Linux LVM"); - if ( fs_id == 0x93) return( "Amoeba"); - if ( fs_id == 0x94) return( "Amoeba BBT"); - if ( fs_id == 0x9f) return( "BSD/OS"); - if ( fs_id == 0xa0) return( "Hibernation"); - if ( fs_id == 0xa5) return( "FreeBSD"); - if ( fs_id == 0xa6) return( "OpenBSD"); - if ( fs_id == 0xa9) return( "NetBSD"); - if ( fs_id == 0x102) return( "Apple_HFS"); - if ( fs_id == 0x103) return( "EFI boot"); - if ( fs_id == 0x104) return( "Service"); - if ( fs_id == 0x105) return( "Microsoft reserved"); - if ( fs_id == 0x106) return( "Apple_UFS"); - return( "unknown" ); - }; + +global string FsIdToString(integer fs_id) +{ + switch (fs_id) + { + case 0x0: return "empty"; + case 0x1: return "FAT12"; + case 0x2: return "XENIX root"; + case 0x3: return "XENIX usr"; + case 0x4: return "FAT16 <32M"; + case 0x5: return "Extended"; + case 0x6: return "FAT16"; + case 0x7: return "HPFS/NTFS"; + case 0x8: return "AIX"; + case 0x9: return "AIX boot"; + case 0xa: return "OS/2 boot manager"; + case 0xb: return "Win95 FAT32"; + case 0xc: return "Win95 FAT32 LBA"; + case 0xe: return "Win95 FAT16"; + case 0xf: return "Extended"; + case 0xa7: return "NeXTSTEP"; + case 0xb7: return "BSDI fs"; + case 0xb8: return "BSDI swap"; + case 0xc1: return "DRDOS/sec"; + case 0xc4: return "DRDOS/sec"; + case 0xc6: return "DRDOS/sec"; + case 0xc7: return "Syrinx"; + case 0xda: return "Non-Fs data"; + case 0xdb: return "CP/M / CTOS"; + case 0xde: return "Dell Utility"; + case 0xe1: return "DOS access"; + case 0xe3: return "DOS R/O"; + case 0xe4: return "SpeedStor"; + case 0xeb: return "BeOS fs"; + case 0xee: return "EFI GPT"; + case 0xef: return "EFI (FAT-12/16)"; + case 0xf1: return "SpeedStor"; + case 0xf4: return "SpeedStor"; + case 0xf2: return "DOS secondary"; + case 0xfd: return "Linux RAID"; + case 0xfe: return "LANstep"; + case 0xff: return "BBT or NBO reserved"; + case 0x10: return "OPUS"; + case 0x11: return "Hidden FAT12"; + case 0x12: return "Vendor diag"; + case 0x14: return "Hidden FAT16"; + case 0x16: return "Hidden FAT16"; + case 0x17: return "Hidden HPFS/NTFS"; + case 0x18: return "AST Windows"; + case 0x1b: return "Hidden Win95"; + case 0x1c: return "Hidden Win95"; + case 0x1e: return "Hidden Win95"; + case 0x24: return "NEC DOS"; + case 0x39: return "Plan 9"; + case 0x3c: return "PartitionMagic"; + case 0x40: return "Venix 80286"; + case 0x41: return "PPC PReP Boot"; + case 0x42: return "SFS"; + case 0x4d: return "QNX4.x"; + case 0x4e: return "QNX4.x 2nd par"; + case 0x4f: return "QNX4.x 3rd par"; + case 0x50: return "OnTrack DM"; + case 0x51: return "OnTrack DM6"; + case 0x52: return "CP/M"; + case 0x53: return "OnTrack DM6"; + case 0x54: return "OnTrack DM6"; + case 0x55: return "EZ-Drive"; + case 0x56: return "Golden Bow"; + case 0x5c: return "Priam Edisk"; + case 0x61: return "SpeedStor"; + case 0x63: return "GNU HURD"; + case 0x64: return "Novell NetWare"; + case 0x65: return "Novell NetWare"; + case 0x70: return "DiskSecure"; + case 0x75: return "PC/IX"; + case 0x80: return "Old Minix"; + case 0x81: return "Minix"; + case 0x82: return "Linux swap"; + case 0x83: return "Linux native"; + case 0x84: return "OS/2 hidden"; + case 0x85: return "Linux extended"; + case 0x86: return "NTFS volume"; + case 0x87: return "NTFS volume"; + case 0x8e: return "Linux LVM"; + case 0x93: return "Amoeba"; + case 0x94: return "Amoeba BBT"; + case 0x9f: return "BSD/OS"; + case 0xa0: return "Hibernation"; + case 0xa5: return "FreeBSD"; + case 0xa6: return "OpenBSD"; + case 0xa9: return "NetBSD"; + case 0x102: return "Apple_HFS"; + case 0x103: return "EFI boot"; + case 0x104: return "Service"; + case 0x105: return "Microsoft reserved"; + case 0x106: return "Apple_UFS"; + default: return "unknown"; + } +} + map capabilities = $[ "msdos" : $[ "extended" : true, "max_primary" : 4 ], -- 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] r49602 - in /trunk/storage/storage/src: inst_custom_part.ycp modules/Storage.ycp
by aschnell＠svn.opensuse.org 03 Aug '08

03 Aug '08

Author: aschnell Date: Sun Aug 3 10:19:09 2008 New Revision: 49602 URL: http://svn.opensuse.org/viewcvs/yast?rev=49602&view=rev Log: - deactivated code that seems to be obsolete Modified: trunk/storage/storage/src/inst_custom_part.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Sun Aug 3 10:19:09 2008 @@ -3025,8 +3025,10 @@ if( ret == `back ) ret = `backtoi; + /* if( ret == `raid_settings || ret == `raid_wizard ) Storage::Record(); + */ y2milestone( "ChangeTime %1", Storage::GetTargetChangeTime() ); Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Sun Aug 3 10:19:09 2008 @@ -2241,14 +2241,17 @@ * * @return boolean */ +/* global define void Record()``{ AddEntry2StorageMaps( record_key, ""); } +*/ /** * * @return boolean */ +/* global define boolean Rollback()``{ integer last_record_entry = FindLastRecordEntry(); if( last_record_entry != 0 ) @@ -2261,11 +2264,13 @@ return false; } } +*/ /** * * @return boolean */ +/* global define boolean Commit() ``{ integer last_record_entry = FindLastRecordEntry(); @@ -2280,6 +2285,7 @@ return false; } } +*/ global define void InstallCallbacks() { -- 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] r49601 - in /trunk/gtk: ChangeLog src/YGRadioButton.cc
by rpmcruz＠svn.opensuse.org 03 Aug '08

03 Aug '08

Author: rpmcruz Date: Sun Aug 3 04:31:40 2008 New Revision: 49601 URL: http://svn.opensuse.org/viewcvs/yast?rev=49601&view=rev Log: * src/YGRadioButton.cc: we set radio and check buttons horizontally stretchable to fill all the area, for cosmetic reasons. Don't do it when inside an horizontal box as it messes the layout. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGRadioButton.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=49601&r1=49600… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sun Aug 3 04:31:40 2008 @@ -12,6 +12,10 @@ * src/YGTable.cc: looks like yast2-qt sends two signals when a combo box item is selected. Replicate the behavior as the printer tool depends on it. + * src/YGRadioButton.cc: we set radio and check buttons horizontally stretchable + to fill all the area, for cosmetic reasons. Don't do it when inside an horizontal + box as it messes the layout. + 2008-07-31 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: online update was broken. Modified: trunk/gtk/src/YGRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGRadioButton.cc?rev=496… ============================================================================== --- trunk/gtk/src/YGRadioButton.cc (original) +++ trunk/gtk/src/YGRadioButton.cc Sun Aug 3 04:31:40 2008 @@ -31,6 +31,16 @@ return type; } +#include "YLayoutBox.h" + +static bool is_horizontal_box (YWidget *widget) +{ + YLayoutBox *box = dynamic_cast <YLayoutBox *> (widget); + if (box) + return box->primary() == YD_HORIZ; + return false; +} + #include "YRadioButton.h" #include "YRadioButtonGroup.h" @@ -43,7 +53,8 @@ { IMPL setBorder (0); - setStretchable (YD_HORIZ, true); + if (!is_horizontal_box (parent)) + setStretchable (YD_HORIZ, true); setLabel (label); gtk_button_set_use_underline (GTK_BUTTON (getWidget()), TRUE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (getWidget()), FALSE); @@ -141,7 +152,8 @@ { IMPL setBorder (0); - setStretchable (YD_HORIZ, true); + if (!is_horizontal_box (parent)) + setStretchable (YD_HORIZ, true); setLabel (label); gtk_button_set_use_underline (GTK_BUTTON (getWidget()), TRUE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (getWidget()), isChecked); -- 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] r49600 - /trunk/gtk/src/YGComboBox.cc
by rpmcruz＠svn.opensuse.org 02 Aug '08

02 Aug '08

Author: rpmcruz Date: Sun Aug 3 00:54:11 2008 New Revision: 49600 URL: http://svn.opensuse.org/viewcvs/yast?rev=49600&view=rev Log: It doesn't seem like YComboBox is supposed to send SelectionChanged at all. Modified: trunk/gtk/src/YGComboBox.cc Modified: trunk/gtk/src/YGComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGComboBox.cc?rev=49600&… ============================================================================== --- trunk/gtk/src/YGComboBox.cc (original) +++ trunk/gtk/src/YGComboBox.cc Sun Aug 3 00:54:11 2008 @@ -134,21 +134,7 @@ // Events notifications static void selected_changed_cb (GtkComboBox *widget, YGComboBox *pThis) { - /* selected_changed_cb() is called when a new item was selected or the user has - typed some text on a writable ComboBox. text_changed is true for the later and - false for the former. */ -#if 0 - bool text_changed = GTK_IS_COMBO_BOX_ENTRY (widget) - && pThis->focusItem() == NULL; - if (text_changed) - pThis->emitEvent (YEvent::ValueChanged, true, true); - else - pThis->emitEvent (YEvent::SelectionChanged, true, true); -#else - // yast2-qt seems to effectively do this: (and the printer tool depends on it.) - pThis->emitEvent (YEvent::SelectionChanged, true, true); pThis->emitEvent (YEvent::ValueChanged); -#endif } YGWIDGET_IMPL_COMMON -- 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] r49599 - in /trunk/gtk: ChangeLog src/YGComboBox.cc
by rpmcruz＠svn.opensuse.org 02 Aug '08

02 Aug '08

Author: rpmcruz Date: Sat Aug 2 19:59:40 2008 New Revision: 49599 URL: http://svn.opensuse.org/viewcvs/yast?rev=49599&view=rev Log: * src/YGTable.cc: looks like yast2-qt sends two signals when a combo box item is selected. Replicate the behavior as the printer tool depends on it. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGComboBox.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=49599&r1=49598… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sat Aug 2 19:59:40 2008 @@ -9,6 +9,9 @@ it was Introduced when added the multiSelection flag. GtkTreeSelection::changed signal works funny; use GtkTreeView::cursor_changed. + * src/YGTable.cc: looks like yast2-qt sends two signals when a combo box + item is selected. Replicate the behavior as the printer tool depends on it. + 2008-07-31 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: online update was broken. Modified: trunk/gtk/src/YGComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGComboBox.cc?rev=49599&… ============================================================================== --- trunk/gtk/src/YGComboBox.cc (original) +++ trunk/gtk/src/YGComboBox.cc Sat Aug 2 19:59:40 2008 @@ -137,12 +137,18 @@ /* selected_changed_cb() is called when a new item was selected or the user has typed some text on a writable ComboBox. text_changed is true for the later and false for the former. */ +#if 0 bool text_changed = GTK_IS_COMBO_BOX_ENTRY (widget) && pThis->focusItem() == NULL; if (text_changed) pThis->emitEvent (YEvent::ValueChanged, true, true); else pThis->emitEvent (YEvent::SelectionChanged, true, true); +#else + // yast2-qt seems to effectively do this: (and the printer tool depends on it.) + pThis->emitEvent (YEvent::SelectionChanged, true, true); + pThis->emitEvent (YEvent::ValueChanged); +#endif } YGWIDGET_IMPL_COMMON -- 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] r49598 - in /trunk/gtk: ChangeLog src/YGTable.cc
by rpmcruz＠svn.opensuse.org 02 Aug '08

02 Aug '08

Author: rpmcruz Date: Sat Aug 2 18:58:15 2008 New Revision: 49598 URL: http://svn.opensuse.org/viewcvs/yast?rev=49598&view=rev Log: * src/YGTable.cc: fixed random crash on the "printer" tool. Looks like it was Introduced when added the multiSelection flag. GtkTreeSelection::changed signal works funny; use GtkTreeView::cursor_changed. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGTable.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=49598&r1=49597… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sat Aug 2 18:58:15 2008 @@ -5,6 +5,10 @@ * src/ygtkrichtext.c: added support for the "hr" tag. Image at src/hr.xpm + * src/YGTable.cc: fixed random crash on the "printer" tool. Looks like + it was Introduced when added the multiSelection flag. + GtkTreeSelection::changed signal works funny; use GtkTreeView::cursor_changed. + 2008-07-31 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: online update was broken. Modified: trunk/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTable.cc?rev=49598&r1=… ============================================================================== --- trunk/gtk/src/YGTable.cc (original) +++ trunk/gtk/src/YGTable.cc Sat Aug 2 18:58:15 2008 @@ -106,7 +106,7 @@ GtkTreePath *path = gtk_tree_model_get_path (getModel(), iter); gtk_tree_view_expand_to_path (getView(), path); - gtk_tree_selection_select_path (getSelection(), path); + gtk_tree_view_set_cursor (getView(), path, NULL, FALSE); gtk_tree_view_scroll_to_cell (getView(), path, NULL, TRUE, 0.5, 0.5); gtk_tree_path_free (path); unblockEvents(); @@ -156,7 +156,7 @@ emitEvent (YEvent::ValueChanged); } - static void selected_cb (GtkTreeView *tree_view, YGTableView* pThis) + static void selected_cb (GtkTreeView *view, YGTableView* pThis) { IMPL if (pThis->blockSelected) @@ -228,7 +228,7 @@ g_signal_connect (G_OBJECT (getWidget()), "row-activated", G_CALLBACK (activated_cb), (YGTableView*) this); - g_signal_connect_after (G_OBJECT (getSelection()), "changed", + g_signal_connect (G_OBJECT (getWidget()), "cursor-changed", G_CALLBACK (selected_cb), (YGTableView*) this); if (!keepSorting()) setSortable (true); -- 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] r49597 - in /trunk/gtk/src: Makefile.am YGText.cc YGTextView.cc
by rpmcruz＠svn.opensuse.org 02 Aug '08

02 Aug '08

Author: rpmcruz Date: Sat Aug 2 18:28:38 2008 New Revision: 49597 URL: http://svn.opensuse.org/viewcvs/yast?rev=49597&view=rev Log: renamed YGTextView.cc to YGText.cc Added: trunk/gtk/src/YGText.cc (props changed) - copied unchanged from r49596, trunk/gtk/src/YGTextView.cc Removed: trunk/gtk/src/YGTextView.cc Modified: trunk/gtk/src/Makefile.am Modified: trunk/gtk/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Makefile.am?rev=49597&r1… ============================================================================== --- trunk/gtk/src/Makefile.am (original) +++ trunk/gtk/src/Makefile.am Sat Aug 2 18:28:38 2008 @@ -26,7 +26,7 @@ YGPushButton.cc \ YGProgressBar.cc \ YGInputField.cc \ - YGTextView.cc \ + YGText.cc \ YGIntField.cc \ YGRadioButton.cc \ YGImage.cc \ -- 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] r49596 - /tags/stable-2_17_8/storage/
by aschnell＠svn.opensuse.org 02 Aug '08

02 Aug '08

Author: aschnell Date: Sat Aug 2 17:18:51 2008 New Revision: 49596 URL: http://svn.opensuse.org/viewcvs/yast?rev=49596&view=rev Log: Created tag stable-2_17_8 for storage Added: tags/stable-2_17_8/storage/ - copied from r49595, trunk/storage/ -- 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] r49595 - /trunk/gtk/src/YGWidget.cc
by rpmcruz＠svn.opensuse.org 02 Aug '08

02 Aug '08

Author: rpmcruz Date: Sat Aug 2 06:50:22 2008 New Revision: 49595 URL: http://svn.opensuse.org/viewcvs/yast?rev=49595&view=rev Log: Fixed debug code. Modified: trunk/gtk/src/YGWidget.cc Modified: trunk/gtk/src/YGWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGWidget.cc?rev=49595&r1… ============================================================================== --- trunk/gtk/src/YGWidget.cc (original) +++ trunk/gtk/src/YGWidget.cc Sat Aug 2 06:50:22 2008 @@ -55,9 +55,13 @@ IMPL // remove children if container? #if 0 + struct inner { + static void foreach_child_cb (GtkWidget *child, GtkContainer *container) + { gtk_container_remove (container, child); } + }; if (GTK_IS_CONTAINER (m_widget)) gtk_container_foreach (GTK_CONTAINER (m_widget), - (GtkCallback) gtk_container_remove, NULL); + (GtkCallback) inner::foreach_child_cb, m_widget); #endif gtk_widget_destroy (m_adj_size); g_object_unref (G_OBJECT (m_adj_size)); -- 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] r49594 - /trunk/gtk/src/ygtkrichtext.c
by rpmcruz＠svn.opensuse.org 02 Aug '08

02 Aug '08

Author: rpmcruz Date: Sat Aug 2 06:25:24 2008 New Revision: 49594 URL: http://svn.opensuse.org/viewcvs/yast?rev=49594&view=rev Log: Cosmetic tweak on the "pre" tag. Modified: trunk/gtk/src/ygtkrichtext.c Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=49594… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Sat Aug 2 06:25:24 2008 @@ -148,7 +148,7 @@ "size", (int)(size * PANGO_SCALE_SMALL), NULL); gtk_text_buffer_create_tag (buffer, "tt", "family", "monospace", NULL); gtk_text_buffer_create_tag (buffer, "pre", "family", "monospace", - "paragraph-background", "#f0f0f0", NULL); + "paragraph-background", "#f0f0f0", "left-margin", 16, "right-margin", 20, NULL); gtk_text_buffer_create_tag (buffer, "b", "weight", PANGO_WEIGHT_BOLD, NULL); gtk_text_buffer_create_tag (buffer, "i", "style", PANGO_STYLE_ITALIC, NULL); gtk_text_buffer_create_tag (buffer, "u", "underline", PANGO_UNDERLINE_SINGLE, NULL); -- 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] r49593 - /trunk/gtk/src/YGUtils.cc
by rpmcruz＠svn.opensuse.org 02 Aug '08

02 Aug '08

Author: rpmcruz Date: Sat Aug 2 06:18:20 2008 New Revision: 49593 URL: http://svn.opensuse.org/viewcvs/yast?rev=49593&view=rev Log: Forgot to contemplate for the "pre" tag in the space tweak. Modified: trunk/gtk/src/YGUtils.cc Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=49593&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Sat Aug 2 06:18:20 2008 @@ -262,7 +262,7 @@ GQueue *tag_queue = g_queue_new(); int i = 0; - gboolean was_space = TRUE; + gboolean was_space = TRUE, pre_mode = FALSE; skipSpace (instr, i); // we must add an outer tag to make GMarkup happy @@ -318,6 +318,9 @@ tag->str[tag->len - 1] != '/') g_string_append_c (tag, '/'); + if (!g_ascii_strncasecmp (tag->str, "pre", 3)) + pre_mode = !is_close; + // Add quoting for un-quoted attributes for (int j = 0; j < (signed) tag->len; j++) { if (tag->str[j] == '=') { @@ -374,7 +377,7 @@ } else { // Normal text - if (g_ascii_isspace (instr[i])) { + if (!pre_mode && g_ascii_isspace (instr[i])) { if (!was_space) g_string_append_c (outp, ' '); was_space = TRUE; -- 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] r49592 - /trunk/gtk/src/YGPackageSelector.cc
by rpmcruz＠svn.opensuse.org 02 Aug '08

02 Aug '08

Author: rpmcruz Date: Sat Aug 2 05:26:25 2008 New Revision: 49592 URL: http://svn.opensuse.org/viewcvs/yast?rev=49592&view=rev Log: Better wording. Modified: trunk/gtk/src/YGPackageSelector.cc Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Sat Aug 2 05:26:25 2008 @@ -617,9 +617,9 @@ if (!isTree) { GtkWidget *buttons = gtk_vbox_new (FALSE, 0), *button; - button = create_toggle_button (pkg_list_mode_xpm, "List view", NULL); + button = create_toggle_button (pkg_list_mode_xpm, "View as list", NULL); gtk_box_pack_start (GTK_BOX (buttons), button, FALSE, TRUE, 0); - button = create_toggle_button (pkg_tiles_mode_xpm, "Tiles view", button); + button = create_toggle_button (pkg_tiles_mode_xpm, "View as grid", button); gtk_box_pack_start (GTK_BOX (buttons), button, FALSE, TRUE, 0); gtk_widget_show_all (buttons); -- 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] r49591 - in /trunk/gtk: ChangeLog src/Makefile.am src/icons/hr.xpm src/ygtkrichtext.c
by rpmcruz＠svn.opensuse.org 02 Aug '08

02 Aug '08

Author: rpmcruz Date: Sat Aug 2 04:34:17 2008 New Revision: 49591 URL: http://svn.opensuse.org/viewcvs/yast?rev=49591&view=rev Log: * src/ygtkrichtext.c: added support for the "hr" tag. Image at src/hr.xpm Added: trunk/gtk/src/icons/hr.xpm Modified: trunk/gtk/ChangeLog trunk/gtk/src/Makefile.am trunk/gtk/src/ygtkrichtext.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=49591&r1=49590… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sat Aug 2 04:34:17 2008 @@ -3,6 +3,8 @@ * src/YGUtils.cc & src/ygtkrichtext.c: fixed some glitches left from bug 396692, and fixed bug 404817 glitch. + * src/ygtkrichtext.c: added support for the "hr" tag. Image at src/hr.xpm + 2008-07-31 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: online update was broken. Modified: trunk/gtk/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Makefile.am?rev=49591&r1… ============================================================================== --- trunk/gtk/src/Makefile.am (original) +++ trunk/gtk/src/Makefile.am Sat Aug 2 04:34:17 2008 @@ -90,5 +90,6 @@ icons/pkg-locked.xpm \ icons/harddisk.xpm \ icons/harddisk-full.xpm \ + icons/hr.xpm \ pkg-selector-help.h Added: trunk/gtk/src/icons/hr.xpm URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/hr.xpm?rev=49591&v… ============================================================================== --- trunk/gtk/src/icons/hr.xpm (added) +++ trunk/gtk/src/icons/hr.xpm Sat Aug 2 04:34:17 2008 @@ -0,0 +1,173 @@ +/* XPM */ +static const char * hr_xpm[] = { +"200 1 169 2", +" c None", +". c #F0F8F0", +"+ c #EEF8EF", +"@ c #EEF7ED", +"# c #EDF6EC", +"$ c #EBF6EB", +"% c #E9F4E9", +"& c #E9F4E8", +"* c #E7F3E7", +"= c #E6F3E6", +"- c #E4F2E4", +"; c #E2F1E3", +"> c #E1F1E1", +", c #E0F0E0", +"' c #DFEFDF", +") c #DDEFDE", +"! c #DCEEDD", +"~ c #DBEEDB", +"{ c #DAEDDA", +"] c #D8EDD8", +"^ c #D7ECD7", +"/ c #D5EBD5", +"( c #D4EBD4", +"_ c #D3EAD3", +": c #D2EAD2", +"< c #D0E9D0", +"[ c #CFE8CF", +"} c #CEE8CE", +"| c #CCE7CC", +"1 c #CBE6CB", +"2 c #CAE5CA", +"3 c #C9E5C9", +"4 c #C7E4C7", +"5 c #C6E4C6", +"6 c #C4E3C4", +"7 c #C3E2C3", +"8 c #C2E2C2", +"9 c #C1E1C0", +"0 c #BFE1C0", +"a c #BEE0BE", +"b c #BDE0BC", +"c c #BBDFBB", +"d c #BADEBA", +"e c #B8DEB8", +"f c #B7DDB7", +"g c #B6DCB6", +"h c #B5DBB5", +"i c #B3DBB3", +"j c #B2DAB2", +"k c #B1DAB1", +"l c #AFD9AF", +"m c #AED8AE", +"n c #ADD8AD", +"o c #ABD7AC", +"p c #AAD6AA", +"q c #A8D6A9", +"r c #A7D5A7", +"s c #A6D5A6", +"t c #A4D4A4", +"u c #A3D3A3", +"v c #A2D3A2", +"w c #A0D2A0", +"x c #A0D1A0", +"y c #9ED19E", +"z c #9CD19D", +"A c #9BCF9B", +"B c #9ACF9A", +"C c #99CF99", +"D c #98CE97", +"E c #96CD97", +"F c #95CC94", +"G c #94CC94", +"H c #92CB92", +"I c #91CA91", +"J c #90CA8F", +"K c #8EC98E", +"L c #8DC88D", +"M c #8BC88C", +"N c #8AC88B", +"O c #89C689", +"P c #87C788", +"Q c #86C586", +"R c #85C585", +"S c #84C484", +"T c #82C483", +"U c #81C380", +"V c #7FC37F", +"W c #7EC27E", +"X c #7DC17D", +"Y c #7BC17C", +"Z c #7ABF7B", +"` c #79BF79", +" . c #78BF78", +".. c #76BE76", +"+. c #75BE75", +"@. c #74BD73", +"#. c #73BC72", +"$. c #71BB71", +"%. c #70BA70", +"&. c #6FBA6E", +"*. c #6EBA6E", +"=. c #EFF7EF", +"-. c #EEF7EE", +";. c #ECF6EC", +">. c #EAF5EA", +",. c #E9F5E9", +"'. c #E8F4E8", +"). c #E4F3E4", +"!. c #E3F1E3", +"~. c #E2F1E2", +"{. c #DFF0DF", +"]. c #DEEFDD", +"^. c #DCEFDC", +"/. c #DAEED9", +"(. c #D8ECD8", +"_. c #D7ECD6", +":. c #D6ECD6", +"<. c #D4EAD4", +"[. c #D2EAD1", +"}. c #D1E9D1", +"|. c #CDE7CD", +"1. c #CBE7CB", +"2. c #CAE6CA", +"3. c #C8E5C9", +"4. c #C7E5C7", +"5. c #C6E4C5", +"6. c #C5E3C4", +"7. c #C0E1C1", +"8. c #BFE1BF", +"9. c #BDE0BE", +"0. c #BDDFBC", +"a. c #BCDEBB", +"b. c #B4DBB5", +"c. c #B2DAB1", +"d. c #B0DAB0", +"e. c #B0D9B0", +"f. c #AED9AE", +"g. c #ACD8AC", +"h. c #ACD8AB", +"i. c #AAD6A9", +"j. c #A7D6A8", +"k. c #A6D4A6", +"l. c #A5D4A5", +"m. c #A3D3A4", +"n. c #A1D2A1", +"o. c #9FD29F", +"p. c #9CD09C", +"q. c #9BD09C", +"r. c #98CE99", +"s. c #97CE98", +"t. c #96CD96", +"u. c #95CD95", +"v. c #93CC93", +"w. c #8FCA8F", +"x. c #8DC88C", +"y. c #8CC88B", +"z. c #8AC78A", +"A. c #88C687", +"B. c #86C587", +"C. c #84C585", +"D. c #82C382", +"E. c #80C381", +"F. c #80C280", +"G. c #7EC27F", +"H. c #7CC07B", +"I. c #7AC07B", +"J. c #75BD75", +"K. c #74BD74", +"L. c #6EBB6E", +". =.-.;.>.,.'.* = ).!.~., {.].^.~ /.(._.:.<._ [.}.[ |.| 1.2.3.4.5.6.7 8 7.8.9.0.a.d e f g b.i c.d.e.f.g.h.i.q j.k.l.m.v n.o.y p.q.B r.s.t.u.v.H I w.K x.y.z.O A.B.C.S D.E.F.G.X H.I.` ...J.K.#.$.%.L.*.*.L.%.$.#.K.J... .` I.H.X G.F.E.D.S C.B.A.O z.y.x.K w.I H v.u.t.s.r.B q.p.y o.n.v m.l.k.j.q i.h.g.f.e.d.c.i b.g f e d a.0.9.8.7.8 7 6.5.4.3.2.1.| |.[ }.[._ <.:._.(./.~ ^.].{., ~.!.).= * '.,.>.;.-.=.. "}; Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=49591… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Sat Aug 2 04:34:17 2008 @@ -404,6 +404,8 @@ state->htags = g_list_append (state->htags, tag); } +#include "icons/hr.xpm" + static void rt_end_element (GMarkupParseContext *context, const gchar *element_name, @@ -445,6 +447,16 @@ else if (!g_ascii_strcasecmp (element_name, "pre")) state->pre_mode = FALSE; + else if (!g_ascii_strcasecmp (element_name, "hr")) { + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data (hr_xpm); + gtk_text_buffer_insert_pixbuf (state->buffer, &end, pixbuf); + g_object_unref (pixbuf); + gtk_text_buffer_get_iter_at_mark (state->buffer, &start, tag->mark); + gtk_text_buffer_get_end_iter (state->buffer, &end); + gtk_text_buffer_apply_tag_by_name (state->buffer, "center", &start, &end); + appendLines = 1; + } + if (isBlockTag (element_name) || !g_ascii_strcasecmp (element_name, "br")) { appendLines = 1; if (isBlockTag (element_name) && gtk_text_iter_starts_line (&end)) -- 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] r49590 - in /trunk/gtk: ChangeLog src/YGUtils.cc src/ygtkrichtext.c
by rpmcruz＠svn.opensuse.org 02 Aug '08

02 Aug '08

Author: rpmcruz Date: Sat Aug 2 04:07:20 2008 New Revision: 49590 URL: http://svn.opensuse.org/viewcvs/yast?rev=49590&view=rev Log: * src/YGUtils.cc & src/ygtkrichtext.c: fixed some glitches left from bug 396692, and fixed bug 404817 glitch. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGUtils.cc trunk/gtk/src/ygtkrichtext.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=49590&r1=49589… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sat Aug 2 04:07:20 2008 @@ -1,3 +1,8 @@ +2008-08-02 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGUtils.cc & src/ygtkrichtext.c: fixed some glitches left from + bug 396692, and fixed bug 404817 glitch. + 2008-07-31 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: online update was broken. Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=49590&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Sat Aug 2 04:07:20 2008 @@ -262,6 +262,7 @@ GQueue *tag_queue = g_queue_new(); int i = 0; + gboolean was_space = TRUE; skipSpace (instr, i); // we must add an outer tag to make GMarkup happy @@ -311,10 +312,10 @@ } // Unmatched tags - if ( !is_close && tag_len == 2 && - (!g_ascii_strncasecmp (tag->str, "hr", 2) || + if (!is_close && tag_len == 2 && + (!g_ascii_strncasecmp (tag->str, "hr", 2) || !g_ascii_strncasecmp (tag->str, "br", 2)) && - tag->str[tag->len - 1] != '/') + tag->str[tag->len - 1] != '/') g_string_append_c (tag, '/'); // Add quoting for un-quoted attributes @@ -369,10 +370,20 @@ // Replace this by a white-space g_string_append (outp, " "); i += sizeof (" ") - 2; + was_space = FALSE; } - else // Normal text - g_string_append_c (outp, instr[i]); + else { // Normal text + if (g_ascii_isspace (instr[i])) { + if (!was_space) + g_string_append_c (outp, ' '); + was_space = TRUE; + } + else { + was_space = FALSE; + g_string_append_c (outp, instr[i]); + } + } } emit_unclosed_tags_for (outp, tag_queue, "", 0); Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=49590… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Sat Aug 2 04:07:20 2008 @@ -274,8 +274,6 @@ free_list (state->htags); } -static gchar *elide_whitespace (const gchar *instr, gint len); - // Tags to support: and not : // either 'elide' \ns (turn off with <pre> I guess static void @@ -301,7 +299,9 @@ // Check if this is a block tag if (isBlockTag (element_name)) { // make sure this opens a new paragraph - if (!gtk_text_iter_starts_line (&iter)) { + if (state->html_list && gtk_text_iter_get_line_offset (&iter) < 6) + ; // on a list, there is the "1. " in the buffer so we have to do this + else if (!gtk_text_iter_starts_line (&iter)) { gtk_text_buffer_insert (state->buffer, &iter, "\n", -1); gtk_text_buffer_get_end_iter (state->buffer, &iter); } @@ -447,6 +447,8 @@ if (isBlockTag (element_name) || !g_ascii_strcasecmp (element_name, "br")) { appendLines = 1; + if (isBlockTag (element_name) && gtk_text_iter_starts_line (&end)) + appendLines = 0; state->closed_block_tag = TRUE; } else @@ -480,15 +482,13 @@ gtk_text_buffer_insert_with_tags (state->buffer, &start, text, text_len, NULL, NULL); else { - if (!state->closed_block_tag) { - if (g_ascii_isspace (text[0])) - gtk_text_buffer_insert (state->buffer, &start, " ", 1); + int i = 0; + if (state->closed_block_tag) { + for (; i < text_len; i++) + if (!g_ascii_isspace (text[i])) + break; } - state->closed_block_tag = FALSE; - - gchar *real = elide_whitespace (text, text_len); - gtk_text_buffer_insert (state->buffer, &start, real, -1); - g_free (real); + gtk_text_buffer_insert (state->buffer, &start, text+i, text_len-i); } gtk_text_buffer_get_end_iter (state->buffer, &end); } @@ -523,31 +523,6 @@ return g_object_new (YGTK_TYPE_RICH_TEXT, NULL); } -/* String preparation methods. */ -static gchar *elide_whitespace (const gchar *instr, gint len) -{ - GString *dest = g_string_new (""); - if (len < 0) - len = strlen (instr); - // collapse more than one space in one - gboolean start_text = TRUE, is_white = FALSE; - gint i; - for (i = 0; i < len; i++) { - gchar ch = instr[i]; - if (g_ascii_isspace (ch)) { - if (!is_white && !start_text) - g_string_append_c (dest, ' '); - is_white = TRUE; - } - else { - g_string_append_c (dest, ch); - is_white = FALSE; - start_text = FALSE; - } - } - return g_string_free (dest, FALSE); -} - void ygtk_rich_text_set_text (YGtkRichText* rtext, const gchar* text, gboolean plain_mode) { GtkTextBuffer *buffer; -- 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] r49589 - in /trunk/storage/libstorage/src: AppUtil.cc AppUtil.h AsciiFile.cc AsciiFile.h
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 17:56:26 2008 New Revision: 49589 URL: http://svn.opensuse.org/viewcvs/yast?rev=49589&view=rev Log: - cleanup Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/AsciiFile.cc trunk/storage/libstorage/src/AsciiFile.h Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.c… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Fri Aug 1 17:56:26 2008 @@ -272,20 +272,6 @@ } -void putNthWord(int Num_iv, string Word_Cv, string& Line_Cr) -{ - string Last_Ci = extractNthWord(Num_iv, Line_Cr, true); - int Len_ii = Last_Ci.find_first_of(app_ws); - Line_Cr.replace(Line_Cr.length() - Last_Ci.length(), Len_ii, Word_Cv); -} - - -void removeLastIf (string& Text_Cr, char Char_cv) -{ - if (Text_Cr.length() > 0 && Text_Cr[Text_Cr.length() - 1] == Char_cv) - Text_Cr.erase(Text_Cr.length() - 1); -} - string normalizeDevice( const string& dev ) { string ret( dev ); Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Fri Aug 1 17:56:26 2008 @@ -41,7 +41,6 @@ void getFindMap( const char* path, std::map<string,string>& m, bool unique=true ); void getFindRevMap( const char* path, std::map<string,string>& m ); -void removeLastIf(string& Text_Cr, char Char_cv); string normalizeDevice( const string& dev ); void normalizeDevice( string& dev ); string undevDevice( const string& dev ); Modified: trunk/storage/libstorage/src/AsciiFile.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AsciiFile… ============================================================================== --- trunk/storage/libstorage/src/AsciiFile.cc (original) +++ trunk/storage/libstorage/src/AsciiFile.cc Fri Aug 1 17:56:26 2008 @@ -418,6 +418,13 @@ } +void AsciiFile::removeLastIf (string& Text_Cr, char Char_cv) const +{ + if (Text_Cr.length() > 0 && Text_Cr[Text_Cr.length() - 1] == Char_cv) + Text_Cr.erase(Text_Cr.length() - 1); +} + + #if 0 void AsciiFile::put( const Regex& Pat_Cv, const String& Line_Cv ) { Modified: trunk/storage/libstorage/src/AsciiFile.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AsciiFile… ============================================================================== --- trunk/storage/libstorage/src/AsciiFile.h (original) +++ trunk/storage/libstorage/src/AsciiFile.h Fri Aug 1 17:56:26 2008 @@ -57,6 +57,7 @@ protected: bool appendFile( const string& Name_Cv, std::vector<string>& Lines_Cr ); bool appendFile( AsciiFile& File_Cv, std::vector<string>& Lines_Cr ); + void removeLastIf(string& Text_Cr, char Char_cv) const; bool BackupCreated_b; string BackupExtension_C; -- 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] r49588 - in /trunk/bootloader/src: clients/ grub/ modules/ routines/
by juhliarik＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: juhliarik Date: Fri Aug 1 17:20:30 2008 New Revision: 49588 URL: http://svn.opensuse.org/viewcvs/yast?rev=49588&view=rev Log: added support for deleting devices from device.map Modified: trunk/bootloader/src/clients/bootloader_proposal.ycp trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/modules/Bootloader.ycp trunk/bootloader/src/routines/lilolike.ycp trunk/bootloader/src/routines/misc.ycp trunk/bootloader/src/routines/popups.ycp Modified: trunk/bootloader/src/clients/bootloader_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloade… ============================================================================== --- trunk/bootloader/src/clients/bootloader_proposal.ycp (original) +++ trunk/bootloader/src/clients/bootloader_proposal.ycp Fri Aug 1 17:20:30 2008 @@ -89,6 +89,8 @@ // into our configuration BootGRUB::merge_level = `main; Bootloader::Propose (); + + BootGRUB::merge_level = `none; } else @@ -100,6 +102,26 @@ ret = $[ "raw_proposal" : Bootloader::Summary ()]; + + if (Bootloader::getLoaderType () == "grub") + { + import "BootGRUB"; + if (BootGRUB::CheckDeviceMap()) + { + ret = (map<string,any>) union (ret, + $[ + "warning_level" : `blocker, + "warning" : + ret["warning"]:"" + + _("Configure a valid boot loader location before continuing. +The device map includes more than 8 devices and the boot device is out of range. +The range is the first 8 devices by BIOS."), + ] + ); + return ret; + } + } + //F#300779 - Install diskless client (NFS-root) //kokso: bootloader will not be installed Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev… ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Fri Aug 1 17:20:30 2008 @@ -23,6 +23,7 @@ import "Mode"; import "BootCommon"; import "PackageSystem"; + import "Map"; // -------------------------------------------------------------- @@ -1115,6 +1116,72 @@ } +/** + * FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 + * The function reduce record (devices) in device.map + * Grub doesn't support more than 8 devices in device.map + * There is selected the first 7 devices + boot or root device + * @param string boot device with udev id name + * @return boolean true if there was added boot device (disk) and it the 9th or following disk in order + */ +global boolean ReduceDeviceMapTo8(string boot_dev, string boot_dev_mountby) +{ + boolean result = false; + + if (size(BootCommon::device_mapping)>8) + { + result = true; + list <string> bios_order = (list <string> ) Map::Values(BootCommon::device_mapping); + //delete all grub devices with order more than 9 + bios_order = filter(string key, bios_order, {return (size(key) < 4);}); + bios_order = lsort(bios_order); + y2debug("ordered values (grub devices): %1", bios_order); + map<string,string> inverse_device_map = $[]; + map<string,string> new_device_map = $[]; + y2milestone("Device map before reducing: %1", BootCommon::device_mapping); + foreach(string key, string value, BootCommon::device_mapping, + { + inverse_device_map[value]=key; + }); + + y2debug("inverse_device_map: %1", inverse_device_map); + integer index = 0; + boolean boot_device_added = false; + foreach(string key, bios_order, + { + string device_name = inverse_device_map[key]:""; + if (index < 8) + { + y2debug("adding device: %1 with key: %2 and index is: %3", device_name, key, index); + new_device_map[device_name]=key; + if ((device_name == boot_dev) || (device_name == boot_dev_mountby)) + boot_device_added = true; + index = index + 1; + } else { + if (boot_device_added) + { + //new_device_map[device_name]=key; + + y2milestone("Device map includes boot disk"); + break; + } else { + + y2error("Device map doesn't include boot disk"); + result = true; + break; + + } + } + }); + BootCommon::device_mapping = new_device_map; + y2milestone("Device map with the first 7 device + boot device: %1", BootCommon::device_mapping); + } else { + y2milestone("Device map includes less than 9 devices. It is not reduced. device_map: %1", BootCommon::device_mapping); + } + return result; +} + + } //last "}" /* Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommo… ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Fri Aug 1 17:20:30 2008 @@ -184,6 +184,14 @@ */ global boolean activate = false; + +/** FATE #303548 - Grub: limit device.map to devices detected by BIOS + * Ask user if he wants to edit again bootloader settings + * It is used if device.map is limited and "boot" disk is out of range + * The range is the first 8 devices + */ +global boolean ask_user = false; + /** * Replace MBR with generic code after bootloader installation? */ Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Fri Aug 1 17:20:30 2008 @@ -622,9 +622,8 @@ * @param flush boolean true to flush settings to the disk * @return boolean true if success */ -global boolean Save (boolean clean, boolean init, boolean flush) { - - +global boolean Save (boolean clean, boolean init, boolean flush) +{ // check if windows is on second disk and add remap if it is necessary // FATE #301994: Correct device mapping in case windows is installed on the second HD BootCommon::sections = checkWidnowsSection(BootCommon::sections); @@ -846,6 +845,17 @@ ]; } + +global boolean CheckDeviceMap() +{ + // FATE #303548 - Grub: limit device.map to devices detected by BIOS + string boot_disk = BootCommon::getBootDisk(); + boolean ret = ReduceDeviceMapTo8(boot_disk, BootCommon::DevToLabelUdevID(boot_disk)); + + return ret; + +} + } // EOF /* Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloade… ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Fri Aug 1 17:20:30 2008 @@ -560,6 +560,7 @@ y2milestone ("Reinitialize bootloader library before saving: %1", reinit); ret = blSave (true, reinit, true) && ret; + if (! ret) y2error ("Error before configuration files saving finished"); @@ -684,7 +685,7 @@ dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice); else dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice); - if (dev["disk"]:"" == "/dev/nfs") + if (dev["disk"]:"" == "/dev/nfs") { y2milestone("Bootloader::Write() -> Boot partition is nfs type, bootloader will not be installed."); return ret; Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike… ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Fri Aug 1 17:20:30 2008 @@ -1496,72 +1496,6 @@ return ret; } -/** - * FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 - * The function reduce record (devices) in device.map - * Grub doesn't support more than 8 devices in device.map - * There is selected the first 7 devices + boot or root device - * @param string boot device with udev id name - * @return boolean true if there was deleted any disks from device.map - */ -global boolean ReduceDeviceMapTo8(string boot_dev) -{ - boolean result = false; - - if (size(device_mapping)>8) - { - result = true; - list <string> bios_order = (list <string> ) Map::Values(device_mapping); - //delete all grub devices with order more than 9 - bios_order = filter(string key, bios_order, {return (size(key) < 4);}); - bios_order = lsort(bios_order); - y2debug("ordered values (grub devices): %1", bios_order); - map<string,string> inverse_device_map = $[]; - map<string,string> new_device_map = $[]; - y2milestone("Device map before reducing: %1", device_mapping); - foreach(string key, string value, device_mapping, - { - inverse_device_map[value]=key; - }); - - y2debug("inverse_device_map: %1", inverse_device_map); - integer index = 0; - boolean boot_device_added = false; - foreach(string key, bios_order, - { - string device_name = inverse_device_map[key]:""; - if (index < 7) - { - y2debug("adding device: %1 with key: %2 and index is: %3", device_name, key, index); - new_device_map[device_name]=key; - if (device_name == boot_dev) - boot_device_added = true; - index = index + 1; - } else { - if (boot_device_added) - { - new_device_map[device_name]=key; - break; - } else { - if (haskey(device_mapping, boot_dev)) - { - new_device_map[boot_dev]=device_mapping[boot_dev]:""; - break; - } else { - - y2error("Boot disk device: %1 was not found in device_mapping: %2", boot_dev, device_mapping); - break; - } - } - } - }); - device_mapping = new_device_map; - y2milestone("Device map with the first 7 device + boot device: %1", device_mapping); - } else { - y2milestone("Device map includes less than 9 devices. It is not reduced. device_map: %1", device_mapping); - } - return result; -} } // EOF Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp… ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Fri Aug 1 17:20:30 2008 @@ -1701,5 +1701,38 @@ } +/** FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 + * Function select boot device - disk + * + * @return string name of boot device - disk + */ + +global string getBootDisk() +{ + string boot_device = ""; + if (BootCommon::BootPartitionDevice != "") + boot_device = BootCommon::BootPartitionDevice; + else if (BootCommon::RootPartitionDevice != "") + boot_device = BootCommon::RootPartitionDevice; + + if (boot_device == "") + { + y2milestone("BootPartitionDevice and RootPartitionDevice are empty"); + return boot_device; + } + map p_dev = Storage::GetDiskPartition (boot_device); + + string boot_disk_device = p_dev["disk"]:""; + + if ((boot_disk_device != "") && (boot_disk_device != nil)) + { + y2milestone("Boot device - disk: %1", boot_disk_device); + return boot_disk_device; + } + + y2milestone("Finding boot disk failed!"); + return ""; +} + } //end of include Modified: trunk/bootloader/src/routines/popups.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/popups.y… ============================================================================== --- trunk/bootloader/src/routines/popups.ycp (original) +++ trunk/bootloader/src/routines/popups.ycp Fri Aug 1 17:20:30 2008 @@ -257,6 +257,7 @@ ")); } + /** * Display popup */ -- 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] r49587 - /trunk/ldap-server/src/tree_structure.ycp
by rhafer＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: rhafer Date: Fri Aug 1 16:29:17 2008 New Revision: 49587 URL: http://svn.opensuse.org/viewcvs/yast?rev=49587&view=rev Log: - removed unneeded function - check TLS settings when enabling ldaps Modified: trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Aug 1 16:29:17 2008 @@ -157,32 +157,34 @@ LdapServer::SetServiceEnabled( false ); } - if ( (boolean) UI::QueryWidget( `id( `cb_interface_ldap ), `Value ) ) - { - LdapServer::SetProtocolListenerEnabled( "ldap", true ); - } - else - { - LdapServer::SetProtocolListenerEnabled( "ldap", false ); - } - + LdapServer::SetProtocolListenerEnabled( "ldap", (boolean) UI::QueryWidget( `id( `cb_interface_ldap ), `Value ) ); + LdapServer::SetProtocolListenerEnabled( "ldapi", (boolean) UI::QueryWidget( `id( `cb_interface_ldapi ), `Value ) ); if ( (boolean) UI::QueryWidget( `id( `cb_interface_ldaps ), `Value ) ) { - LdapServer::SetProtocolListenerEnabled( "ldaps", true ); + map<string, any> tls = LdapServer::GetTlsConfig(); + if ( (string)tls["caCertFile"]:"" != "" && + (string)tls["certFile"]:"" != "" && + (string)tls["certKeyFile"]:"" != "" ) + { + LdapServer::SetProtocolListenerEnabled( "ldaps", true ); + } + else + { + if ( Popup::YesNoHeadline( _("Your TLS/SSL Configuration seems to be incomplete."), + _("Do you really want to enable the \"ldaps\" protocol listener?") ) ) + { + LdapServer::SetProtocolListenerEnabled( "ldaps", true ); + } + else + { + LdapServer::SetProtocolListenerEnabled( "ldaps", false ); + } + } } else { LdapServer::SetProtocolListenerEnabled( "ldaps", false ); } - - if ( (boolean) UI::QueryWidget( `id( `cb_interface_ldapi ), `Value ) ) - { - LdapServer::SetProtocolListenerEnabled( "ldapi", true ); - } - else - { - LdapServer::SetProtocolListenerEnabled( "ldapi", false ); - } return true; } @@ -311,28 +313,6 @@ ** tls handlers *****************************/ -define boolean cb_check_tls() -``{ - y2milestone( "calling tls check handler" ); - -// map<string,string> importPaths = LdapServer::ReadImportCertificates(); -// boolean use_common_ca = LdapServer::ReadConfigureCommonServerCertificate(); -// map<string,string> tlsSettings = (map<string,string>)LdapServer::ReadTlsSettings(); -// -// if( (boolean)UI::QueryWidget( `rb_yes, `Value ) && !( -// haskey( importPaths, "ServerCertificateFile" ) || -// use_common_ca || -// ( tlsSettings["TLSCertificateFile"]:nil != nil && tlsSettings["TLSCertificateKeyFile"]:nil != nil ) ) -// ) -// { -// /*error popup*/ -// callback_error = _("Choose a certificate if you want to activate TLS."); -// return false; -// } - - return true; -} - define boolean cb_read_tls() ``{ y2milestone( "calling tls read handler" ); @@ -1021,7 +1001,6 @@ /* Tree item */ "name" : _("TLS Settings"), "widget" : tlsWidget, - "cb_check" : ``( cb_check_tls() ), "cb_read" : ``( cb_read_tls() ), "cb_write" : ``( cb_write_tls() ), "cb_input" : ``( cb_input_tls() ) -- 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] r49586 - /trunk/ldap-server/src/LdapServer.pm
by rhafer＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: rhafer Date: Fri Aug 1 16:29:14 2008 New Revision: 49586 URL: http://svn.opensuse.org/viewcvs/yast?rev=49586&view=rev Log: Don't crash when overwriting existing configuration Modified: trunk/ldap-server/src/LdapServer.pm Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Aug 1 16:29:14 2008 @@ -34,6 +34,7 @@ my $configured = 0; my $usesBackConfig = 0; my $slapdConfChanged = 0; +my $overwriteConfig = 0; my $serviceEnabled = 0; my $serviceRunning = 1; my $registerSlp = 0; @@ -377,8 +378,9 @@ my $self = shift; y2milestone("LdapServer::Write"); my $ret = 1; - if ( ! $usesBackConfig || ! $slapdConfChanged ) + if ( ! $usesBackConfig || ! $slapdConfChanged || $overwriteConfig ) { + $overwriteConfig = 0; my $progressItems = [ _("Writing Startup Configuration"), _("Cleaning up config directory"), _("Creating Configuration"), @@ -606,6 +608,7 @@ { return YaST::YCP::Boolean($usingDefaults); } + ## # Return packages needed to be installed and removed during # Autoinstallation to insure module has all needed software @@ -887,7 +890,8 @@ $self->InitDbDefaults(); } y2milestone(Data::Dumper->Dump([\%dbDefaults])); - $usingDefaults = 1; + $usingDefaults = 1; + $overwriteConfig = 1; return \%dbDefaults; } -- 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] r49585 - in /trunk/storage/storage/src/include: custom_part_dialogs.ycp lvm_lib.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 15:55:43 2008 New Revision: 49585 URL: http://svn.opensuse.org/viewcvs/yast?rev=49585&view=rev Log: - fixed Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/include/lvm_lib.ycp Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Fri Aug 1 15:55:43 2008 @@ -38,7 +38,11 @@ include "partitioning/partition_defines.ycp"; include "partitioning/custom_part_helptexts.ycp"; - include "partitioning/signatures.ycp"; + + // TODO: cleanup + boolean check_unique_label( map<string,map> targetMap, map part ); + boolean CheckFstabOptions( map part ); + symbol check_devices_used( list<map> partitions, boolean not_cr ); define string DlgCreateCryptFs( string device, integer minpwlen, boolean format, Modified: trunk/storage/storage/src/include/lvm_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_lib.ycp Fri Aug 1 15:55:43 2008 @@ -22,6 +22,10 @@ include "partitioning/partition_defines.ycp"; + // TODO: cleanup + void new_vg_list( list vg_list ); + + textdomain "storage"; define string lvmVg( string vg ) -- 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] r49584 - in /trunk/storage/storage/src/include: lvm_lib.ycp lvm_ui_lib.ycp signatures.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 15:46:15 2008 New Revision: 49584 URL: http://svn.opensuse.org/viewcvs/yast?rev=49584&view=rev Log: - removed obsolete code Removed: trunk/storage/storage/src/include/signatures.ycp Modified: trunk/storage/storage/src/include/lvm_lib.ycp trunk/storage/storage/src/include/lvm_ui_lib.ycp Modified: trunk/storage/storage/src/include/lvm_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_lib.ycp Fri Aug 1 15:46:15 2008 @@ -20,7 +20,7 @@ include "partitioning/partition_defines.ycp"; -include "partitioning/signatures.ycp"; + textdomain "storage"; Modified: trunk/storage/storage/src/include/lvm_ui_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_ui_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_ui_lib.ycp Fri Aug 1 15:46:15 2008 @@ -20,7 +20,6 @@ textdomain "storage"; -#include "partitioning/signatures.ycp"; //////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////// @@ -175,34 +174,6 @@ ///////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////// -//---------------------------------------------------- -// give bar widget if possible - -define term get_bargraph_or_compatible( string avail_vg_size ) - ``{ - if( UI::HasSpecialWidget( `BarGraph )) - { - return( `HBox( - // label text - `Label(_("Available size:")), - `HSpacing(0.5), - `BarGraph( `id(`vg_size), `opt(`hstretch), - [ 0, 10 ], [ "", ""]) - // `Label( `opt( `outputField), avail_vg_size ) - )); - } - else - { - return( `HBox( - // label text - `Bottom(`Left(`Label(_("Available Size:")))), - `Bottom(`Left(`Label( `id(`vg_size), - `opt( `hstretch, `outputField), avail_vg_size ))), - `HWeight(1,`HStretch()) - // `Label( `opt( `outputField), avail_vg_size ) - )); - } - }; //---------------------------------------------------- // give table for step 2: create volume group, add phys. volumes (pv) @@ -259,70 +230,6 @@ ); }; - - -////////////////////////////////////////////////////////////////////// -// give main page for configuration - X11 version -////////////////////////////////////////////////////////////////////// - -define term get_config_content( list pv_table_list, list lv_table_list, - list vg_list, string phys_vg_size, - string avail_vg_size, boolean view_all_mnts ) - ``{ - return( `HBox( `HSpacing(0.5), - `VBox( - `VSquash(`HBox( - `Left(`ReplacePoint( `id(`rvg ), - `ComboBox(`id(`vg), - `opt(`notify), - // label text - _("V&olume Group Name"), - vg_list ))), - `HSpacing(2), - // button text - `Left(`Bottom(`PushButton( `id(`vg_add_vg), _("A&dd group")))), - `HSpacing(0.5), - // button text - `Left(`Bottom(`PushButton( `id(`vg_remove_vg), _("Remove &group")))), - `HWeight(1,`HStretch()) - )), - `VSpacing(1), - // label text - `Frame(_("Edit the current volume group:"), - `HBox( - `HWeight( 50, - `VBox( - `VSpacing(0.7), - // label text - `Heading(_("Physical volumes")), - `VSpacing(0.7), - `HBox( - // label text - `Label(_("Physical volume size:")), - `Label( `id(`pv_size), `opt(`outputField), phys_vg_size ) - ), - `VSpacing(0.5), - get_pv_table_content( pv_table_list ) - )), - `HWeight( 50, - `VBox( - `VSpacing(0.5), - // label text - `Heading(_("Logical volumes")), - `VSpacing(0.5), - get_bargraph_or_compatible( avail_vg_size ), - `VSpacing(0.2), - get_lv_table_content( lv_table_list, view_all_mnts ) - )) - ) - ) - ), - `HSpacing(0.5) - ) - ); - }; - - ////////////////////////////////////////////////////////////////////// // give main page for step 2: create volume group, add phys. volumes (pv) -- 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] r49583 - /tags/stable-2_17_5/product-creator/
by jsuchome＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: jsuchome Date: Fri Aug 1 15:44:13 2008 New Revision: 49583 URL: http://svn.opensuse.org/viewcvs/yast?rev=49583&view=rev Log: Created tag stable-2_17_5 for product-creator Added: tags/stable-2_17_5/product-creator/ - copied from r49582, trunk/product-creator/ -- 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] r49582 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: jsuchome Date: Fri Aug 1 15:44:06 2008 New Revision: 49582 URL: http://svn.opensuse.org/viewcvs/yast?rev=49582&view=rev Log: - Image Creator: added GUI to configure image compression - 2.17.5 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=4958… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Fri Aug 1 15:44:06 2008 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Aug 1 15:44:06 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 1 15:36:32 CEST 2008 - jsuchome(a)suse.cz + +- Image Creator: added GUI to configure image compression +- 2.17.5 + +------------------------------------------------------------------- Fri Jul 25 13:02:44 CEST 2008 - jsuchome(a)suse.cz - read the default information for new type from the template Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Fri Aug 1 15:44:06 2008 @@ -58,6 +58,54 @@ * widget handlers ****************************************************************************/ + define void InitCompressionCombo (string id) { + + string current_method = "none"; + foreach (map typemap, (list<map>)KiwiConfig["preferences",0,"type"]:[], { + if (typemap[content_key]:"" == kiwi_task) + { + current_method = typemap["flags"]:current_method; + } + }); + map<string,string> methods = $[ + "unified" : "unified", + "compressed" : "compressed", + "unified-cromfs" : "unified-cromfs", + "compressed-cromfs" : "compressed-cromfs", + // combo box label + "none" : _("None") + ]; + list items = maplist (string method, string label, methods, { + return `item (`id (method), label, method == current_method); + }); + UI::ChangeWidget (`id (id), `Items, items); + } + + define void StoreCompressionCombo (string key, map event) { + + string selected = (string) UI::QueryWidget (`id (key), `Value); + KiwiConfig["preferences",0,"type"] = maplist (map typemap, + (list<map>)KiwiConfig["preferences",0,"type"]:[], + { + if (typemap[content_key]:"" == kiwi_task) + { + if (selected == "none") + { + if (haskey (typemap, "flags")) + typemap = remove (typemap, "flags"); + } + else + typemap["flags"] = selected; + } + return typemap; + }); + } + + define symbol HandleCompressionCombo (string key, map event) { + if (event["ID"]:nil == `next) StoreCompressionCombo (key, event); + return nil; + } + /** * Initialize the widget with ignored packages */ @@ -1233,14 +1281,10 @@ `VBox ( `VSpacing (0.2), `HBox ( - `HWeight (1, "version"), - `HWeight (1, `HBox ("size", "sizeunit")) - /* - `VBox ( - `Label (""), "compressed" - FIXME compressed vs. unified - ) - */ + `HWeight (2, `HBox ( + "version", "size", "sizeunit" + )), + `HWeight (1, "compression") ), `HBox ( `HWeight (2, `VBox ( @@ -1255,7 +1299,7 @@ ), `HSpacing(1)), "widget_names" : [ "version", - "size", "sizeunit", // "compressed", + "size", "sizeunit", "compression", "sw_selection", "rt_sw", "configure_sw", "delete_sw", @@ -1354,6 +1398,18 @@ "store" : StoreCompressCheckBox, "handle" : HandleCompressCheckBox, ], + "compression" : $[ + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + "items" : [], + // textentry label + "label" : _("Co&mpression"), + // help text + "help" :_("Select the value for image Compression. This will modify the flags value of the image type. Check kiwi manual for the meaning of the available values."), + "init" : InitCompressionCombo, + "store" : StoreCompressionCombo, + "handle" : HandleCompressionCombo, + ], "sw_selection" : $[ "widget" : `combobox, "opt" : [ `hstretch, `notify ], -- 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] r49581 - in /trunk/ldap-server/src: tree_structure.ycp widgets.ycp
by rhafer＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: rhafer Date: Fri Aug 1 15:37:04 2008 New Revision: 49581 URL: http://svn.opensuse.org/viewcvs/yast?rev=49581&view=rev Log: - removed lint - offer to start CA Management Module (Fate#303546) Modified: trunk/ldap-server/src/tree_structure.ycp trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Aug 1 15:37:04 2008 @@ -483,127 +483,9 @@ string name = UI::AskForExistingFile( "/var/lib/CAM", "*.pem *.crt *", _("Select Certificate Key File") ); if( name != nil ) UI::ChangeWidget( `te_key_file, `Value, name ); } - else if( handler_cmd == `pb_edit ) + else if( handler_cmd == `pb_launch_ca ) { -// //show edit popup - any ret = nil; -// string dlg_name = common_ca_available ? "type" : "import"; -// term dlg = (term)widget_map["g_tls","dialogs",dlg_name]:nil; -// if( dlg == nil ) -// { -// callback_error = _("An internal error occurred. View the log file."); -// y2error( "cb_input_tls: type dialog is not in widget map" ); -// return false; -// } -// -// UI::OpenDialog( dlg ); -// -// map<string,string> importPaths = LdapServer::ReadImportCertificates(); -// if( dlg_name == "input" ) -// { -// UI::ChangeWidget( `te_cert_file, `Value, importPaths["ServerCertificateFile"]:"" ); -// UI::ChangeWidget( `te_key_file, `Value, importPaths["ServerKeyFile"]:"" ); -// UI::ChangeWidget( `te_ca_file, `Value, importPaths["CACertificatesFile"]:"" ); -// } -// -// if( dlg_name == "type" && haskey( importPaths, "ServerCertificateFile" ) ) -// { -// UI::ChangeWidget( `rb_common, `Value, false ); -// UI::ChangeWidget( `rb_import, `Value, true ); -// } -// -// y2milestone( ">>>> entering cb_input_tls input loop..." ); -// while( true ) -// { -// ret = UI::UserInput(); -// y2milestone( "cb_input_tls: dialog returns '%1'", ret ); -// -// if( dlg_name == "type" ) -// { -// if( ret == `cancel ) break; -// else if( ret == `ok ) -// { -// any do_what = UI::QueryWidget( `rbg_type, `CurrentButton ); -// y2milestone( "cb_input_tls: do_what is '%1'", do_what ); -// if( do_what == `rb_common ) -// { -// //TODO: use common ca -// y2milestone( "cb_input_tls: using common server certificate" ); -// LdapServer::WriteConfigureCommonServerCertificate( true ); -// LdapServer::WriteImportCertificates( $[] ); -// break; -// } else if( do_what == `rb_import ) -// { -// UI::CloseDialog(); -// dlg_name = "import"; -// UI::OpenDialog( (term)widget_map["g_tls","dialogs","import"]:`Label(_("Dialog not found"))); -// -// //fill textentries -// UI::ChangeWidget( `te_cert_file, `Value, importPaths["ServerCertificateFile"]:"" ); -// UI::ChangeWidget( `te_key_file, `Value, importPaths["ServerKeyFile"]:"" ); -// UI::ChangeWidget( `te_ca_file, `Value, importPaths["CACertificatesFile"]:"" ); -// continue; -// } -// } -// } else if( dlg_name == "import" ) -// { -// if( ret == `cancel ) break; -// else if( ret == `pb_ca_file ) -// { -// /* file selection headline */ -// string name = UI::AskForExistingFile( "/var/lib/CAM", "*.pem *.crt *", _("Select CA Certificate File") ); -// if( name != nil ) UI::ChangeWidget( `te_ca_file, `Value, name ); -// continue; -// } else if( ret == `pb_cert_file ) -// { -// /* file selection headline */ -// string name = UI::AskForExistingFile( "/var/lib/CAM", "*.pem *.crt *", _("Select Certificate File") ); -// if( name != nil ) UI::ChangeWidget( `te_cert_file, `Value, name ); -// continue; -// } else if( ret == `pb_key_file ) -// { -// /* file selection headline */ -// string name = UI::AskForExistingFile( "/var/lib/CAM", "*.pem *.crt *", _("Select Certificate Key File") ); -// if( name != nil ) UI::ChangeWidget( `te_key_file, `Value, name ); -// continue; -// } else if( ret == `ok ) -// { -// //TODO: import ca -// //read values -// string cert_file = String::CutBlanks( (string)UI::QueryWidget( `te_cert_file, `Value ) ); -// string key_file = String::CutBlanks( (string)UI::QueryWidget( `te_key_file, `Value ) ); -// string ca_file = String::CutBlanks( (string)UI::QueryWidget( `te_ca_file, `Value ) ); -// -// if( cert_file == "" ) -// { -// /* Error Popup */ -// Popup::Error( _("Server certificate file is required.") ); -// continue; -// } -// -// if( key_file == "" ) -// { -// /* Error Popup */ -// Popup::Error( _("Server key file is required.") ); -// continue; -// } -// -// importPaths["ServerCertificateFile"] = cert_file; -// importPaths["ServerKeyFile"] = key_file; -// if( ca_file != "" ) importPaths["CACertificatesFile"] = ca_file; -// -// y2milestone( "importing certificates" ); -// LdapServer::WriteImportCertificates( importPaths ); -// LdapServer::WriteConfigureCommonServerCertificate( false ); -// -// break; -// } -// } -// } -// y2milestone( "<<<< leaving cb_input_tls input loop..." ); -// -// UI::CloseDialog(); -// eval( cb_read_tls() ); + WFM::CallFunction("ca_mgm", [] ); } //reread tls page return true; Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Fri Aug 1 15:37:04 2008 @@ -194,6 +194,10 @@ ) ) ) + ), + `VSpacing( 0.5 ), + `Left( + `PushButton( `id( `pb_launch_ca ), _("Launch CA Management Module") ) ) ) ); -- 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] r49580 - in /trunk/storage/storage/src/include: lvm_lv_lib.ycp lvm_pv_lib.ycp signatures.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 15:28:07 2008 New Revision: 49580 URL: http://svn.opensuse.org/viewcvs/yast?rev=49580&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/include/lvm_lv_lib.ycp trunk/storage/storage/src/include/lvm_pv_lib.ycp trunk/storage/storage/src/include/signatures.ycp Modified: trunk/storage/storage/src/include/lvm_lv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_lv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_lv_lib.ycp Fri Aug 1 15:28:07 2008 @@ -122,73 +122,6 @@ //////////////////////////////////////////////////////////////////////////////// - // Get all logical volumes and mounted partitions - -define list<map> get_lvs_and_mounted_partitions( map<string,map> targetMap, - boolean view_all_mnts, - string current_vg ) - ``{ - list<map> ret = []; - integer pesize = targetMap["/dev/"+current_vg,"cyl_size"]:(4096*1024); - y2milestone( "current_vg=%2 pesize=%1", pesize, current_vg ); - - ////////////////////////////////////////////////////////////////////// - // add the devicename i.e /dev/hda1 or /dev/system/usr to partition list - // and the device key <subdevice>/<maindevice> i.e. 1//dev/hda - - targetMap = mapmap( string dev, map devmap, targetMap, - ``{ - boolean is_lvm_vg = devmap["type"]:`CT_UNKNOWN==`CT_LVM; - integer cyl_size = devmap["cyl_size"]:0; - - list partitions = maplist( map part, devmap["partitions"]:[], - ``{ - if( is_lvm_vg ) - { - part["lvm_name"] = devmap["name"]:""; - } - part["size_str"] = ByteToHumanStringWithZero(part["size_k"]:0*1024); - - part["maindev"] = dev; - y2debug("devname %1 size %2 pe %3", part["device"]:"", - part["size_k"]:0*1024, pesize ); - return( part ); - }); - - devmap["partitions"] = partitions; - return( $[ dev: devmap ] ); - }); - - //////////////////////////////////////////////////////////// - // Look for all partitions: - // - // normal partition with mountpoint - // logical volume - - if( !view_all_mnts ) - { - string f = "/" + current_vg + "/"; - // only to current vg depending vgs ... - foreach( string dev, map devmap, targetMap, - ``{ - ret = (list<map>)union( ret, filter( map part, devmap["partitions"]:[], - ``( part["type"]:`none == `lvm && - search( part["device"]:"", f )==4 ))); - }); - } - else - { - foreach( string dev, map devmap, targetMap, - ``{ - ret = (list<map>)merge( ret, filter( map part, devmap["partitions"]:[], - ``( size(part["mount"]:"")>0 || - part["type"]:`none == `lvm ))); - }); - } - return( ret ); - }; - - //////////////////////////////////////////////////////////////////////////////// // Get all existing lv names of a volume group list<string> get_lv_names(map<string, map> target_map, string vg_name) Modified: trunk/storage/storage/src/include/lvm_pv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_pv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_pv_lib.ycp Fri Aug 1 15:28:07 2008 @@ -234,61 +234,6 @@ }; - - ////////////////////////////////////////////////////////////////////// - // partition list to widget table - // in: - // [ $["fsid":Partitions::fsid_lvm, - // "fstype":"LVM", - // "nr":"var", - // "region":[255, 16], - // "type":`primary], - // $[ - // "fsid":131, - // "fstype":"Linux native", - // "nr":4, "region":[271, 844], - // ... - // - // out: - // [ - // `item(`id("/dev/hda1"), "/dev/hda1 ", " 2G ", " LVM ", " system"), - // `item(`id("/dev/hda2"), "/dev/hda2 ", " 1G ", " Linux ", " ") - // ]; - -define list get_pv_widget_table( list<map> possPvList ) - ``{ - list ret = []; - - possPvList = - sort( map x, map y, possPvList, - ``{ - if( x["maindev"]:"" == y["maindev"]:"") - { - if( haskey( x, "nr" )) - return( x["nr"]:0 < y["nr"]:0); - else - return( x["name"]:"" < y["name"]:""); - } - else - { - return( x["maindev"]:"" < y["maindev"]:"" ); - } - }); - - return( maplist( map p, possPvList, - ``{ - return(`item( `id(p["device"]:"--"), - p["device"]:"--", - ByteToHumanStringWithZero(p["size_k"]:0*1024), - p["fstype"]:"--", - p["used_by"]:"--" - )); - } - )); - }; - - - /** * Check if the user can delete the partition. * -> Existing LVM partition with volume group Modified: trunk/storage/storage/src/include/signatures.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/sign… ============================================================================== --- trunk/storage/storage/src/include/signatures.ycp (original) +++ trunk/storage/storage/src/include/signatures.ycp Fri Aug 1 15:28:07 2008 @@ -16,8 +16,6 @@ map DlgCreateVolumeGroup( list vgm_list ); void new_vg_list( list vg_list ); integer pesize_str_to_byte( string input ); -list<map> get_lvs_and_mounted_partitions( map<string,map> targetMap, boolean view_all_mnts, - string current_vg ); list get_lv_size_info( map<string,map> targetMap, string current_vg ); void signature_dummy() ``{ return; } -- 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] r49579 - /tags/stable-2_17_1/repair/
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 15:22:50 2008 New Revision: 49579 URL: http://svn.opensuse.org/viewcvs/yast?rev=49579&view=rev Log: Created tag stable-2_17_1 for repair Added: tags/stable-2_17_1/repair/ - copied from r49578, trunk/repair/ -- 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] r49578 - in /trunk/repair: VERSION package/yast2-repair.changes src/OSRPtbl.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 15:20:36 2008 New Revision: 49578 URL: http://svn.opensuse.org/viewcvs/yast?rev=49578&view=rev Log: - use String::FormatSize Modified: trunk/repair/VERSION trunk/repair/package/yast2-repair.changes trunk/repair/src/OSRPtbl.ycp Modified: trunk/repair/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/VERSION?rev=49578&r1=4957… ============================================================================== --- trunk/repair/VERSION (original) +++ trunk/repair/VERSION Fri Aug 1 15:20:36 2008 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: trunk/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.chan… ============================================================================== --- trunk/repair/package/yast2-repair.changes (original) +++ trunk/repair/package/yast2-repair.changes Fri Aug 1 15:20:36 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 01 15:19:50 CEST 2008 - aschnell(a)suse.de + +- use String::FormatSize +- 2.17.1 + +------------------------------------------------------------------- Mon Jun 9 11:49:03 CEST 2008 - jsuchome(a)suse.cz - use ReplaceWidget instead of changing button label (bnc#393832) Modified: trunk/repair/src/OSRPtbl.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRPtbl.ycp?rev=49578… ============================================================================== --- trunk/repair/src/OSRPtbl.ycp (original) +++ trunk/repair/src/OSRPtbl.ycp Fri Aug 1 15:20:36 2008 @@ -25,11 +25,10 @@ import "StorageDevices"; import "Mode"; import "Report"; - + import "String"; import "Label"; import "Popup"; - include "partitioning/partition_defines.ycp"; textdomain "repair"; @@ -338,7 +337,7 @@ n["fsid"]:131, sformat ("%1", n["region",0]:0), sformat ("%1", n["region",1]:0 + n["region",0]:0 - 1), - ByteToHumanString (n["size_k"]:0 * 1024) + String::FormatSize (n["size_k"]:0 * 1024) )); } }); @@ -834,7 +833,7 @@ // partition info 2/3, %1 is partition ID (number) sformat(_("ID %1, "), part["fsid"]:131) + // partition info 3/3, %1 is partition size (number) - sformat (_("Size %1"), ByteToHumanString ( + sformat (_("Size %1"), String::FormatSize ( part["region",1]:0 * maindev["cyl_size"]:0)); } -- 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] r49577 - in /trunk/storage/storage/src: include/custom_part_dialogs.ycp inst_custom_part.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 15:15:03 2008 New Revision: 49577 URL: http://svn.opensuse.org/viewcvs/yast?rev=49577&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Fri Aug 1 15:15:03 2008 @@ -1477,118 +1477,6 @@ }; -define term TargetShowBarGraph( map target, string dev ) - ``{ - list partitions_size = []; - list partitions_text = []; - integer sum_used = 0; - integer cyl_size = target["cyl_size"]:1; - integer cyl_count = target["cyl_count"]:1; - integer min_size = tointeger( cyl_count / 8 ); - - - y2milestone( " target %1" ,target ); - y2milestone( " parts %1", target["partitions"]:[] ); - - foreach( map part, target["partitions"]:[], - ``{ - if( part["type"]:`primary != `extended ) - { - integer part_size = part["region",1]:0; - string part_size_str = ""; - - part_size_str = ByteToHumanString(part_size * cyl_size); - - sum_used = sum_used + part_size; - if( part_size < min_size ) - part_size = min_size; - - partitions_size = add( partitions_size , part_size); - - string part_text = part["mount"]:""; - - if( part_text == "" || part_text == nil ) - part_text = dev + sformat("%1", part["nr"]:(any)0); - - part_text = part_text + "\n" + part_size_str; - - partitions_text = add( partitions_text, part_text ); - } - }); - - integer free = cyl_count - sum_used; - - if( free > 0 ) - { - if( free > min_size ) - partitions_size = add( partitions_size, free ); - else partitions_size = add( partitions_size, min_size ); - // label text - partitions_text = add( partitions_text, _("free")); - } - - if( Mode::test () ) - { - y2milestone(" partitions_size : %1", partitions_size); - y2milestone(" partitions_text : %1", partitions_text); - } - - return `BarGraph(`opt(`vstretch), partitions_size , partitions_text ); - }; - - - -define boolean TargetAllocationDlg( map target, string dev) - ``{ - if( ! UI::HasSpecialWidget(`BarGraph) ) - { - // %1 is a disk device, example: You have selected the disk /dev/hda, but can only edit a partition like /dev/hda11, /dev/hda2, - Popup::Warning(sformat(_("\n You have selected the disk %1, but you can \n only edit a partition like %11, %12, ... \n"), dev)); - } - else - { - UI::OpenDialog(`opt(`decorated ), - `VBox( - `VSpacing(1), - `Left( `Heading( dev + ":")), - `VSpacing(1), - `VStretch(), - `HSpacing(80), - TargetShowBarGraph(target ,dev), - `VStretch(), - `VSpacing(1), - `HBox( - `PushButton(`id(`close), Label::CloseButton() ) - ) - )); - - UI::UserInput(); - UI::CloseDialog(); - } - - return true; - }; - - - - -define boolean DDZeroPartitionTable( string del_dev, integer size_k ) - ``{ - // popup text - if( Popup::YesNo(sformat(_("CAUTION -If you delete the partition table and disk label of -device %1, data on this device will be lost. - -Really do this? -"), del_dev))) - { - Storage::DeletePartitionTable(del_dev,size_k); - return true; - } - return false; - }; - - symbol ReallyInstPrepdisk() { symbol ret = `none; Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Fri Aug 1 15:15:03 2008 @@ -2577,7 +2577,6 @@ } else { - TargetAllocationDlg(tg[id]:$[], id ); } } else if( part["type"]:`unknown == `lvm ) @@ -2821,18 +2820,6 @@ // Delete partition table and disk label ///////////////////////////////////////////////////////////// - if( ret == `delete_parttable ) - { - string ddev = ChooseDisk( tg, - // heading text - _("Delete Partition Table"), `delete ); - // not cancel - if( ddev != nil ) - { - DDZeroPartitionTable( ddev, tg[ddev,"size_k"]:0 ); - } - } - if( Arch::s390 () && ret==`dasdfmt ) { string id = (string)UI::QueryWidget(`id(`table), `CurrentItem); -- 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] r49576 - in /trunk/storage: storage/src/Makefile.am storage/src/inst_lvm_lv.ycp storage/src/inst_lvm_pv.ycp yast2-storage.spec.in
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 15:09:15 2008 New Revision: 49576 URL: http://svn.opensuse.org/viewcvs/yast?rev=49576&view=rev Log: - removed obsolete files Removed: trunk/storage/storage/src/inst_lvm_lv.ycp trunk/storage/storage/src/inst_lvm_pv.ycp Modified: trunk/storage/storage/src/Makefile.am trunk/storage/yast2-storage.spec.in Modified: trunk/storage/storage/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/Makefile.am?… ============================================================================== --- trunk/storage/storage/src/Makefile.am (original) +++ trunk/storage/storage/src/Makefile.am Fri Aug 1 15:09:15 2008 @@ -10,8 +10,6 @@ inst_custom_part.ycp \ inst_disk.ycp \ inst_do_resize.ycp \ - inst_lvm_lv.ycp \ - inst_lvm_pv.ycp \ inst_disk_proposal.ycp \ inst_prepdisk.ycp \ inst_resize_ui.ycp \ Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Fri Aug 1 15:09:15 2008 @@ -46,10 +46,8 @@ %dir @yncludedir@/partitioning @yncludedir@/partitioning/*.ycp @clientdir@/inst_custom_part.ycp -@clientdir@/inst_lvm_lv.ycp @clientdir@/inst_resize_ui.ycp @clientdir@/inst_disk.ycp -@clientdir@/inst_lvm_pv.ycp @clientdir@/inst_target_part.ycp @clientdir@/inst_do_resize.ycp @clientdir@/inst_disk_proposal.ycp -- 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] r49575 - in /trunk/storage/storage/src: include/ep-lvm-lib.ycp include/lvm_pv_lib.ycp inst_custom_part.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 14:59:18 2008 New Revision: 49575 URL: http://svn.opensuse.org/viewcvs/yast?rev=49575&view=rev Log: - cleanup Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp trunk/storage/storage/src/include/lvm_pv_lib.ycp trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-lib.ycp Fri Aug 1 14:59:18 2008 @@ -44,7 +44,10 @@ if (size(unused_pvs) < 1) { - Error(_("There are not enough suitable unused devices to create a volume group.")); + Error(_("There are not enough suitable unused devices to create a volume group. + +To use LVM, at least one unused partition of type 0x8e (or 0x83) or one unused +RAID device is required. Change your partition table accordingly.")); return; } Modified: trunk/storage/storage/src/include/lvm_pv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_pv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_pv_lib.ycp Fri Aug 1 14:59:18 2008 @@ -316,24 +316,6 @@ return( ret ); } -define boolean check_lvm_possible( map<string,map> targetMap ) - ``{ - boolean possible_part_found = size(get_possible_pvs(targetMap))>0; - if( !possible_part_found ) - { - // Translators: the text 'do not format' must match the label in the corresponding popup! - Popup::Message(_("To use LVM, at least one partition of type 0x8e (or 0x83) -is required. Change your partition table accordingly. -In most cases, this can be done in the following way: -click 'Create', select 'Do not format', and set the File System ID to 0x8e. -")); - } - else if( Mode::normal() ) - { - possible_part_found = Package::InstallAll( ["lvm2"] ); - } - return possible_part_found; - } boolean check_vgname_dev( string vgname ) { Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Fri Aug 1 14:59:18 2008 @@ -2903,85 +2903,6 @@ } } - ///////////////////////////////////////////////////////////// - // REREAD - ///////////////////////////////////////////////////////////// - - if (ret == `reread) - { - boolean ret2 = true; - - if( ask_reread ) - // popup text - ret2 = Popup::YesNo(_("Rereading the partition table cancels all current changes. Really reread the partition table?")); - - if( ret2 ) - { - Storage::ReReadTargetMap(); - } - } - - - ///////////////////////////////////////////////////////////// - // Raid - ///////////////////////////////////////////////////////////// - - if( ret == `raid_wizard ) - { - if( !check_raid_possible( tg )) - { - ret = `again; - continue; - } - } - - if( ret == `loop_edit || ret == `loop_create ) - { - string id = (string)UI::QueryWidget( `id(`table), `CurrentItem ); - Storage::SetWizardKey( id ); - if( ret == `loop_edit ) - { - if( search( id, "/dev/loop" )!=0 ) - { - // popup text - Popup::Message( _("Select a loop device entry.") ); - ret = `again; - continue; - } - } - LoopSetup( ret==`loop_edit ); - if( ret==`loop_create ) - { - map dev = Storage::GetDisk( Storage::GetTargetMap(), "/dev/loop" ); - UI::ReplaceWidget( `id(`loop_button), - LoopButton(size(dev["partitions"]:[])) ); - } - } - - if( ret == `nfs || ret == `nfs_edit ) - { - string id = (string)UI::QueryWidget( `id(`table), `CurrentItem ); - Storage::SetWizardKey( id ); - NfsSetup( ret == `nfs_edit ); - } - - ///////////////////////////////////////////////////////////// - // LVM - ///////////////////////////////////////////////////////////// - - if (ret == `lvm) - { - if( !check_lvm_possible( tg ) ) - { - ret = `again; - continue; - } - else if( Mode::normal () ) - { - Package::InstallAll( ["lvm2"] ); - } - } - ///////////////////////////////////////////////////////////// // Adapt mount points from existing /etc/fstab ///////////////////////////////////////////////////////////// -- 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] r49574 - /trunk/storage/storage/src/include/custom_part_dialogs.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 14:46:54 2008 New Revision: 49574 URL: http://svn.opensuse.org/viewcvs/yast?rev=49574&view=rev Log: - use `HelpText option Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Fri Aug 1 14:46:54 2008 @@ -364,32 +364,30 @@ helptext = helptext + add_help ; }); - UI::OpenDialog( `opt(`decorated), - `HBox( - `HWeight(4, `RichText( helptext )), - `HWeight(7, - `VBox( - `HSpacing(50), - // heading text - `Left(`Heading(_("File system options:"))), - `VStretch(), - `VSpacing(1), - `HBox( - `HStretch(), - `HSpacing(1), - contents, - `HStretch(), - `HSpacing(1)), - `VSpacing(1), - `VStretch(), - `HBox( - `Bottom(`PushButton(`id(`ok), - `opt(`default), - Label::OKButton())), - `Bottom( - `PushButton(`id(`cancel), - Label::CancelButton()))) - )))); + UI::OpenDialog(`opt(`decorated), + `VBox( + `HSpacing(50), + // heading text + `Left(`Heading(_("File system options:"))), + `VStretch(), + `VSpacing(1), + `HBox( + `HStretch(), + `HSpacing(1), + contents, + `HStretch(), + `HSpacing(1)), + `VSpacing(1), + `VStretch(), + `HBox( + `Left(`PushButton(`id(`help),`opt(`helpButton), Label::HelpButton())), + `Right(`HBox(`PushButton(`id(`ok), `opt(`default), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton()))) + ) + ) + ); + + UI::ChangeWidget(`help, `HelpText, helptext); foreach(any query_key, map<string, any> option_map, fs_options, ``{ @@ -620,32 +618,30 @@ old_state[opt_list[size(opt_list)-1,`query_key]:""] = arb_opt; y2milestone( "FstabOptions old_state=%1", old_state ); - UI::OpenDialog( `opt(`decorated), - `VBox ( - `HSpacing(50), - // heading text - `Left(`Heading(_("Fstab options:"))), - `VStretch(), - `VSpacing(1), - `HBox(`HStretch(), - `HSpacing(1), - contents, - `HStretch(), - `HSpacing(1)), - `VSpacing(1), - `VStretch(), - `HBox( - `Left(`PushButton(`id(`help),`opt(`helpButton), Label::HelpButton())), - `Right(`HBox ( - `PushButton(`id(`ok), - `opt(`default), - Label::OKButton()), - `PushButton(`id(`cancel), - Label::CancelButton())) - ) - ) - ) - ); + UI::OpenDialog(`opt(`decorated), + `VBox( + `HSpacing(50), + // heading text + `Left(`Heading(_("Fstab options:"))), + `VStretch(), + `VSpacing(1), + `HBox(`HStretch(), + `HSpacing(1), + contents, + `HStretch(), + `HSpacing(1)), + `VSpacing(1), + `VStretch(), + `HBox( + `Left(`PushButton(`id(`help),`opt(`helpButton), Label::HelpButton())), + `Right(`HBox(`PushButton(`id(`ok), `opt(`default), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton())) + ) + ) + ) + ); + + UI::ChangeWidget(`help, `HelpText, helptext); if( UI::WidgetExists( `id(`mt_group) )) { @@ -706,10 +702,6 @@ { ret = UI::UserInput(); y2milestone( "FstabOptions ret %1", ret ); - if( ret == `help) - { - Popup::LongText(_("Fstab Options Help"), `RichText(helptext), 50,20); - } if( ret == "opt_noauto" ) { if( UI::WidgetExists( `id("opt_user") )) -- 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] r49573 - in /trunk/ldap-server/src: LdapServer.pm tree_structure.ycp
by rhafer＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: rhafer Date: Fri Aug 1 14:20:12 2008 New Revision: 49573 URL: http://svn.opensuse.org/viewcvs/yast?rev=49573&view=rev Log: - Moved validation of TLS Parameters from the GUI into main module - Made SSL listener checkbox working in TLS dialog Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Aug 1 14:20:12 2008 @@ -755,13 +755,32 @@ { my $self = shift; my $tls = shift; - my $ret = SCR->Execute(".target.bash", - "/usr/bin/setfacl -m u:ldap:r ".$tls->{'certKeyFile'}); - if($ret != 0) { - return $self->SetError(_("Can not set a filesystem acl on the private key"), - "setfacl -m u:ldap:r "./etc/ssl/servercerts/serverkey.pem." failed.\n". - "Do you have filesystem acl support disabled?" ); - return 0; + if ( YaST::YCP::Boolean($tls->{'tls_active'}) ) + { + if ( SCR->Read(".target.size", $tls->{"caCertFile"}) <= 0) + { + $self->SetError( _("CA Certificate File does not exist"), ""); + return 0; + } + if ( SCR->Read(".target.size", $tls->{"certFile"}) <= 0) + { + $self->SetError( _("Certificate File does not exist"), "" ); + return 0; + } + if ( SCR->Read(".target.size", $tls->{"certKeyFile"}) <= 0) + { + $self->SetError( _("Certificate Key File does not exist"), ""); + return 0; + } + + if ( SCR->Execute(".target.bash", + "/usr/bin/setfacl -m u:ldap:r ".$tls->{'certKeyFile'}) ) + { + $self->SetError(_("Can not set a filesystem acl on the private key"), + "setfacl -m u:ldap:r ".$tls->{'certKeyFile'}." failed.\n". + "Do you have filesystem acl support disabled?" ); + return 0; + } } my $rc = SCR->Write('.ldapserver.global.tlsSettings', $tls ); return 1; @@ -774,7 +793,7 @@ my $ret = SCR->Execute(".target.bash", "/usr/bin/setfacl -m u:ldap:r /etc/ssl/servercerts/serverkey.pem"); if($ret != 0) { - return $self->SetError(_("Can not set a filesystem acl on the private key"), + $self->SetError(_("Can not set a filesystem acl on the private key"), "setfacl -m u:ldap:r /etc/ssl/servercerts/serverkey.pem failed.\n". "Do you have filesystem acl support disabled?" ); return 0; @@ -1273,7 +1292,7 @@ sub GetProtocolListenerEnabled { my ( $self, $protocol ) = @_; - y2milestone("GetProtocolListenerEnabled $protocol (ldapi $use_ldapi_listener, ldaps $use_ldaps_listener, ldap $use_ldap_listener"); + y2milestone("GetProtocolListenerEnabled $protocol (ldapi $use_ldapi_listener, ldaps $use_ldaps_listener, ldap $use_ldap_listener)"); if ( $protocol eq "ldap" ) { return $use_ldap_listener; Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Aug 1 14:20:12 2008 @@ -362,6 +362,7 @@ UI::ChangeWidget( `cb_use_common_cert, `Enabled, false ); UI::ChangeWidget( `fr_import_cert, `Enabled, false ); } + UI::ChangeWidget( `cb_ssl_listener_enabled, `Value, LdapServer::GetProtocolListenerEnabled("ldaps") ); UI::ChangeWidget( `te_ca_file, `Value, tls["caCertFile"]:"" ); UI::ChangeWidget( `te_cert_file, `Value, tls["certFile"]:"" ); UI::ChangeWidget( `te_key_file, `Value, tls["certKeyFile"]:"" ); @@ -386,29 +387,18 @@ "crlCheck" : 0, "verifyClient" : 0 ]; - if ( SCR::Read(.target.size, tlsSettings["caCertFile"]:"") <= 0) + if ( ! LdapServer::SetTlsConfig( tlsSettings ) ) { - callback_error = _("CA Certificate File does not exist"); - return false; - } - if ( SCR::Read(.target.size, tlsSettings["certFile"]:"") <= 0) - { - callback_error = _("Certificate File does not exist"); - return false; - } - if ( SCR::Read(.target.size, tlsSettings["certKeyFile"]:"") <= 0) - { - callback_error = _("Certificate Key File does not exist"); + map<string, string> err = LdapServer::GetError(); + callback_error = err["msg"]:"" + err["details"]:""; return false; } - - LdapServer::SetTlsConfig( tlsSettings ); + LdapServer::SetProtocolListenerEnabled( "ldaps", (boolean) UI::QueryWidget( `id( `cb_ssl_listener_enabled ), `Value ) ); } else { -// LdapServer::WriteConfigureCommonServerCertificate( false ); -// LdapServer::WriteImportCertificates( $[] ); map<string,any> tlsSettings = $[ + "tls_active" : false, "certKeyFile" : "", "certFile" : "", "caCertFile" : "", @@ -419,6 +409,7 @@ ]; LdapServer::SetTlsConfig( tlsSettings ); + LdapServer::SetProtocolListenerEnabled( "ldaps", false ); } return true; } @@ -435,6 +426,7 @@ if ( tls_enabled_cb ) { UI::ChangeWidget( `cb_ssl_listener_enabled, `Enabled, true ); + UI::ChangeWidget( `cb_ssl_listener_enabled, `Value, true ); if ( common_cert_available ) { UI::ChangeWidget( `cb_use_common_cert, `Enabled, true ); -- 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] r49572 - /trunk/ldap-server/src/LdapServer.pm
by rhafer＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: rhafer Date: Fri Aug 1 14:20:09 2008 New Revision: 49572 URL: http://svn.opensuse.org/viewcvs/yast?rev=49572&view=rev Log: Set filesystem ACLs for Certificate Key Modified: trunk/ldap-server/src/LdapServer.pm Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Aug 1 14:20:09 2008 @@ -755,6 +755,14 @@ { my $self = shift; my $tls = shift; + my $ret = SCR->Execute(".target.bash", + "/usr/bin/setfacl -m u:ldap:r ".$tls->{'certKeyFile'}); + if($ret != 0) { + return $self->SetError(_("Can not set a filesystem acl on the private key"), + "setfacl -m u:ldap:r "./etc/ssl/servercerts/serverkey.pem." failed.\n". + "Do you have filesystem acl support disabled?" ); + return 0; + } my $rc = SCR->Write('.ldapserver.global.tlsSettings', $tls ); return 1; } -- 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] r49571 - /trunk/ldap-server/src/tree_structure.ycp
by rhafer＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: rhafer Date: Fri Aug 1 14:20:05 2008 New Revision: 49571 URL: http://svn.opensuse.org/viewcvs/yast?rev=49571&view=rev Log: Check ssl cert file for existance and error out if they don't exist Modified: trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Aug 1 14:20:05 2008 @@ -386,6 +386,22 @@ "crlCheck" : 0, "verifyClient" : 0 ]; + if ( SCR::Read(.target.size, tlsSettings["caCertFile"]:"") <= 0) + { + callback_error = _("CA Certificate File does not exist"); + return false; + } + if ( SCR::Read(.target.size, tlsSettings["certFile"]:"") <= 0) + { + callback_error = _("Certificate File does not exist"); + return false; + } + if ( SCR::Read(.target.size, tlsSettings["certKeyFile"]:"") <= 0) + { + callback_error = _("Certificate Key File does not exist"); + return false; + } + LdapServer::SetTlsConfig( tlsSettings ); } else -- 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] r49570 - in /trunk/storage/storage/src: include/evms_lib.ycp inst_custom_part.ycp inst_evms.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 12:32:53 2008 New Revision: 49570 URL: http://svn.opensuse.org/viewcvs/yast?rev=49570&view=rev Log: - removed some obsolete evms files Removed: trunk/storage/storage/src/include/evms_lib.ycp trunk/storage/storage/src/inst_evms.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Fri Aug 1 12:32:53 2008 @@ -58,7 +58,6 @@ include "partitioning/custom_part_lib.ycp"; include "partitioning/custom_part_dialogs.ycp"; include "partitioning/custom_part_check_generated.ycp"; - include "partitioning/evms_lib.ycp"; include "partitioning/ep-main.ycp"; @@ -2593,12 +2592,6 @@ } else if( part["type"]:`unknown == `evms ) { - map ad = edit_evms_volume( id, tg ); - // has the user cancelled the dialog? - if( ad["ok"]:false && size( ad["targets"]:$[] )>0 ) - { - Storage::SetTargetMap( ad["targets"]:$[] ); - } } else if( part["type"]:`unknown == `loop ) { -- 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] r49569 - in /trunk/storage/storage/src: include/ep-lib.ycp inst_custom_part.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 12:15:18 2008 New Revision: 49569 URL: http://svn.opensuse.org/viewcvs/yast?rev=49569&view=rev Log: - cleanup Modified: trunk/storage/storage/src/include/ep-lib.ycp trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Fri Aug 1 12:15:18 2008 @@ -78,7 +78,7 @@ { if( Popup::YesNo( sformat(_("Really delete BIOS RAID %1?"), id ))) { - if( deleteAllDevPartitions( disk, Stage::initial(), bsd_label )) + if( deleteAllDevPartitions( disk, Stage::initial(), false )) Storage::DeleteDmraid( id ); return true; } @@ -86,7 +86,7 @@ // YesNo popup text %1 is replaced by a disk name e.g. /dev/hda else if( Popup::YesNo( sformat(_("Really delete all partitions on %1?"), id ))) { - deleteAllDevPartitions( disk, Stage::initial(), bsd_label ); + deleteAllDevPartitions( disk, Stage::initial(), false ); return true; } } @@ -121,7 +121,7 @@ return false; } if( part["type"]:`primary != `extended && - !check_device_delete( part, bsd_label, Stage::initial(), + !check_device_delete( part, false, Stage::initial(), disk )) { return false; Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Fri Aug 1 12:15:18 2008 @@ -59,6 +59,7 @@ include "partitioning/custom_part_dialogs.ycp"; include "partitioning/custom_part_check_generated.ycp"; include "partitioning/evms_lib.ycp"; + include "partitioning/ep-main.ycp"; boolean show_disk = true; @@ -2120,7 +2121,6 @@ // MAIN: ///////////////////////////////////////////////////////////////// - include "partitioning/ep-main.ycp"; return test_new_ep(); -- 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] r49568 - /trunk/storage/package/yast2-storage.changes
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 12:06:25 2008 New Revision: 49568 URL: http://svn.opensuse.org/viewcvs/yast?rev=49568&view=rev Log: - added second fate number Modified: trunk/storage/package/yast2-storage.changes Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Aug 1 12:06:25 2008 @@ -2,7 +2,8 @@ Fri Aug 01 10:42:52 CEST 2008 - aschnell(a)suse.de - redesigned expert partitioner (fate #302054) -- added dialog to choose partition table type (fate #303924) +- added dialog to choose partition table type (fate #303924 and + fate #303026) - version 2.17.8 ------------------------------------------------------------------- -- 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] r49567 - /trunk/users/src/users_proposal.ycp
by jsuchome＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: jsuchome Date: Fri Aug 1 12:01:55 2008 New Revision: 49567 URL: http://svn.opensuse.org/viewcvs/yast?rev=49567&view=rev Log: typo Modified: trunk/users/src/users_proposal.ycp Modified: trunk/users/src/users_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users_proposal.ycp?rev… ============================================================================== --- trunk/users/src/users_proposal.ycp (original) +++ trunk/users/src/users_proposal.ycp Fri Aug 1 12:01:55 2008 @@ -94,7 +94,7 @@ if (UsersSimple::EncryptionMethod () != "blowfish") { // summary line - rest = sformat (_("Password Encrypttion Method: %1"), + rest = sformat (_("Password Encryption Method: %1"), encoding2label[UsersSimple::EncryptionMethod ()]:""); } 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] r49566 - /trunk/storage/storage/src/inst_custom_part.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 11:58:06 2008 New Revision: 49566 URL: http://svn.opensuse.org/viewcvs/yast?rev=49566&view=rev Log: - some cleanup Modified: trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Fri Aug 1 11:58:06 2008 @@ -2120,15 +2120,8 @@ // MAIN: ///////////////////////////////////////////////////////////////// - - - - if (true) - { - include "partitioning/ep-main.ycp"; - return test_new_ep(); - } - + include "partitioning/ep-main.ycp"; + return test_new_ep(); -- 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] r49565 - in /trunk/storage/storage/src: inst_custom_part.ycp modules/Storage.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 11:56:39 2008 New Revision: 49565 URL: http://svn.opensuse.org/viewcvs/yast?rev=49565&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/inst_custom_part.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Fri Aug 1 11:56:39 2008 @@ -48,9 +48,6 @@ import "StorageDevices"; import "ProductFeatures"; - list hitlist = []; - boolean hiterror = false; - include "partitioning/partition_defines.ycp"; include "partitioning/loop.ycp"; include "partitioning/nfs.ycp"; @@ -64,9 +61,6 @@ include "partitioning/evms_lib.ycp"; - // hide some details in the table by default - boolean show_T_details = Storage::GetExpertDetail(); - boolean show_disk = true; boolean edit_cylinder = true; boolean bsd_label = false; @@ -81,18 +75,12 @@ boolean button_loop = true; // Should the "LOOP" -Button be shown in main window boolean button_nfs = true; // Should the "NFS" -Button be shown in main window boolean button_lvm = true; // Should the "LVM" -Button be shown in main window - // Should the "EVMS" -Button be shown in main window - boolean button_evms = ProductFeatures::GetBooleanFeature ("partitioning", "evms_config"); boolean button_expert = true; // Should the "EXPERT"-Button be shown in main window boolean button_delete_parttable = true; // Should the "Delete partition table and disk label" // -Button be shown in Expert menu boolean button_adapt_mp = false; // Should the "Adapt mount points from // existing /etc/fstab" -Button be shown in Expert menu - if( button_evms && Mode::normal() && - SCR::Read( .target.size, "/usr/share/YaST2/clients/inst_evms.ycp" )<=0 ) - button_evms = false; - y2milestone( "EVMS:%1", button_evms ); boolean test_mode = Mode::test (); string boot_mode = "fritz"; string focusline = ""; @@ -2231,10 +2219,6 @@ // main dialog: Button LVM buttonline_b = add( buttonline_b, `PushButton(`id(`lvm), _("&LVM..."))); - if( button_evms ) - // main dialog: Button EVMS - buttonline_b = add( buttonline_b, `PushButton(`id(`evms), _("E&VMS..."))); - // main dialog: Button RAID if( button_raid ) buttonline_b = @@ -2260,7 +2244,7 @@ // check box term details_checkbox = `Left ( - `CheckBox (`id(`show_table_details), `opt(`notify), _("&Show Details"), show_T_details) + `CheckBox (`id(`show_table_details), `opt(`notify), _("&Show Details")) ); string help_text = ""; @@ -3130,8 +3114,6 @@ Wizard::RestoreBackButton(); } - Storage::SetExpertDetail( show_T_details ); - Storage::SaveExpertDetail(); Wizard::RestoreHelp( help_text ); Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Fri Aug 1 11:56:39 2008 @@ -7052,64 +7052,6 @@ return( no_propose_disks ); } -boolean expert_detail = nil; - -list FindExpertLine( map file ) - { - list ret = []; - list<list> t = maplist( integer k, map e, file["l"]:$[], - ``([k, e["line"]:""])); - t = filter( list e, t, ``(search(e[1]:"","EXPERT_DETAIL")==0)); - y2milestone( "FindExpertLine t:%1", t ); - ret = t[0]:[]; - y2milestone( "FindExpertLine ret:%1", ret ); - return( ret ); - } - -global boolean GetExpertDetail() - { - if( expert_detail==nil ) - { - map file = $[]; - AsciiFile::ReadFile( file, "/etc/sysconfig/storage" ); - y2milestone( "GetExpertDetail file:%1", file ); - list l = FindExpertLine( file ); - y2milestone( "GetExpertDetail l:%1", l ); - l = filter( string s, splitstring( l[1]:"", "= " ), ``(size(s)>0)); - y2milestone( "GetExpertDetail l:%1", l ); - if( tointeger(l[1]:"0")==0 ) - expert_detail=false; - else - expert_detail=true; - } - y2milestone( "GetExpertDetail ret:%1", expert_detail ); - return( expert_detail ); - } - -global void SetExpertDetail( boolean val ) - { - y2milestone( "SetExpertDetail val:%1", val ); - expert_detail = val; - } - -global void SaveExpertDetail() - { - y2milestone( "SaveExpertDetail val:%1", expert_detail ); - if( expert_detail!=nil ) - { - map file = $[]; - AsciiFile::ReadFile( file, "/etc/sysconfig/storage" ); - list l = FindExpertLine( file ); - string e = "EXPERT_DETAIL=" + (expert_detail?"1":"0"); - integer lineno = l[0]:(size(file["l"]:$[]) + 1); - if( size(l)==0 ) - file["l",lineno] = $[]; - file["l",lineno,"line"] = e; - file["l",lineno,"changed"] = true; - AsciiFile::RewriteFile( file, "/etc/sysconfig/storage" ); - } - } - global void SetDefaultMountBy(symbol mby) { -- 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] r49564 - /trunk/storage/yast2-storage.spec.in
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 11:19:44 2008 New Revision: 49564 URL: http://svn.opensuse.org/viewcvs/yast?rev=49564&view=rev Log: - adapted file list Modified: trunk/storage/yast2-storage.spec.in Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Fri Aug 1 11:19:44 2008 @@ -59,8 +59,6 @@ @clientdir@/partitions_proposal.ycp @clientdir@/disk.ycp @clientdir@/disk_worker.ycp -@clientdir@/lvm_config.ycp -@clientdir@/lvm_config_ui.ycp @moduledir@/* @fillupdir@/sysconfig.storage -- 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] r49563 - /trunk/storage/lvm/
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 11:02:31 2008 New Revision: 49563 URL: http://svn.opensuse.org/viewcvs/yast?rev=49563&view=rev Log: - removed obsolete code Removed: trunk/storage/lvm/ -- 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] r49562 - in /trunk/storage: ./ data/ disk/src/ lvm/src/ package/ storage/src/ storage/src/include/ storage/src/modules/
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 10:57:04 2008 New Revision: 49562 URL: http://svn.opensuse.org/viewcvs/yast?rev=49562&view=rev Log: - Merged rest of part-design branch changes r44410:49561 into the trunk. Added: trunk/storage/storage/src/include/ep-all.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp trunk/storage/storage/src/include/ep-dialogs.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/include/ep-dm-dialogs.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm-dialogs.ycp trunk/storage/storage/src/include/ep-dm-lib.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm-lib.ycp trunk/storage/storage/src/include/ep-dm.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp trunk/storage/storage/src/include/ep-hd-dialogs.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-hd-lib.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp trunk/storage/storage/src/include/ep-hd.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp trunk/storage/storage/src/include/ep-lib.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-lib.ycp trunk/storage/storage/src/include/ep-log.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-log.ycp trunk/storage/storage/src/include/ep-loop-dialogs.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop-dialogs.ycp trunk/storage/storage/src/include/ep-loop-lib.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop-lib.ycp trunk/storage/storage/src/include/ep-loop.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop.ycp trunk/storage/storage/src/include/ep-lvm-dialogs.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp trunk/storage/storage/src/include/ep-lvm-lib.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp trunk/storage/storage/src/include/ep-lvm.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp trunk/storage/storage/src/include/ep-main.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp trunk/storage/storage/src/include/ep-nfs.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp trunk/storage/storage/src/include/ep-raid-dialogs.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp trunk/storage/storage/src/include/ep-raid-lib.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp trunk/storage/storage/src/include/ep-raid.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp trunk/storage/storage/src/include/ep-settings.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp trunk/storage/storage/src/include/ep-unused.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/ep-unused.ycp trunk/storage/storage/src/include/icons.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/include/icons.ycp trunk/storage/storage/src/modules/DevicesSelectionBox.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/modules/DevicesSelectionBox.ycp trunk/storage/storage/src/modules/DualMultiSelectionBox.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/modules/DualMultiSelectionBox.ycp trunk/storage/storage/src/modules/Greasemonkey.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/modules/Greasemonkey.ycp trunk/storage/storage/src/modules/MiniWorkflow.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/modules/MiniWorkflow.ycp trunk/storage/storage/src/modules/StorageFields.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp trunk/storage/storage/src/modules/StorageSettings.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/modules/StorageSettings.ycp trunk/storage/storage/src/modules/TabPanel.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/modules/TabPanel.ycp trunk/storage/storage/src/modules/TreePanel.ycp - copied unchanged from r49561, branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp Removed: trunk/storage/lvm/src/lvm_config.desktop Modified: trunk/storage/VERSION trunk/storage/configure.in.in trunk/storage/data/sysconfig.storage trunk/storage/disk/src/disk.ycp trunk/storage/disk/src/disk_worker.ycp trunk/storage/lvm/src/Makefile.am trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/include/lvm_lib.ycp trunk/storage/storage/src/include/lvm_lv_lib.ycp trunk/storage/storage/src/include/lvm_pv_lib.ycp trunk/storage/storage/src/include/partition_defines.ycp trunk/storage/storage/src/include/raid_lib.ycp trunk/storage/storage/src/inst_custom_part.ycp trunk/storage/storage/src/inst_disk.ycp trunk/storage/storage/src/modules/FileSystems.ycp trunk/storage/storage/src/modules/Makefile.am trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/storage_finish.ycp trunk/storage/yast2-storage.spec.in Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=49562&r1=495… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Fri Aug 1 10:57:04 2008 @@ -1 +1 @@ -2.17.7 +2.17.8 Modified: trunk/storage/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/configure.in.in?rev=4956… ============================================================================== --- trunk/storage/configure.in.in (original) +++ trunk/storage/configure.in.in Fri Aug 1 10:57:04 2008 @@ -7,6 +7,15 @@ AM_CONDITIONAL(ARCH_S390, test "$target_cpu" == "s390x" -o "$target_cpu" == "s390") +AC_CHECK_PROGS([SWIG], [swig]) +if test -z "$SWIG"; then + AC_MSG_ERROR([install swig]) +fi +AC_CHECK_PROGS([SABCMD], [sabcmd]) +if test -z "$SABCMD"; then + AC_MSG_ERROR([install sablotron]) +fi + ## some common checks @YAST2-CHECKS-COMMON@ @YAST2-CHECKS-YCP@ Modified: trunk/storage/data/sysconfig.storage URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/data/sysconfig.storage?r… ============================================================================== --- trunk/storage/data/sysconfig.storage (original) +++ trunk/storage/data/sysconfig.storage Fri Aug 1 10:57:04 2008 @@ -9,9 +9,25 @@ USED_FS_LIST="" ## Type: string(id,path,device,uuid,label) -# List of possible default mount-by methods +# Default mount-by method. DEVICE_NAMES="id" +## Type: string +# Default filesystem type. +DEFAULT_FS="ext3" + ## Type: integer(0:1) -# Show warning at start of yast2 disk +# Show warning at start of yast2 disk. WARN_EXPERT="1" + +## Type: string(id,path,device) +# Display name in expert-partitioner. +DISPLAY_NAME="device" + +## Type: string +# List of hidden fields in expert-partitioner. +# Allowed values are: label uuid mount_by used_by bios_id start_cyl +# end_cyl num_cyl cyl_size fc_wwpn fc_port_id +# +# Separate individual values by single space +HIDDEN_FIELDS="" Modified: trunk/storage/disk/src/disk.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/disk/src/disk.ycp?rev=49… ============================================================================== --- trunk/storage/disk/src/disk.ycp (original) +++ trunk/storage/disk/src/disk.ycp Fri Aug 1 10:57:04 2008 @@ -16,20 +16,15 @@ * Wrapper file for inst_disk.ycp * */ - { - -/*** - * <h3>Configuration of the disk</h3> - */ - textdomain "storage"; import "Popup"; import "Wizard"; import "Misc"; - string msg=_("Only use this program if you are familiar with partitioning hard disks. + + string msg = _("Only use this program if you are familiar with partitioning hard disks. Never partition disks that may, in any way, be in use (mounted, swap, etc.) unless you know exactly what you are @@ -39,10 +34,10 @@ To continue despite this warning, click Yes. "); - any ret = `back; // no params == UI, some params == commandline - if (size (WFM::Args()) == 0) { + if (size (WFM::Args()) == 0) + { Wizard::CreateDialog(); Wizard::SetContents ( _("Expert Partitioner"), @@ -53,7 +48,6 @@ ); Wizard::SetTitleIcon ("yast-disk"); - ret = `back; // popup headline integer warn = tointeger(Misc::SysconfigRead( .sysconfig.storage.WARN_EXPERT, "1" )); y2milestone( "warn:%1", warn ); @@ -61,16 +55,18 @@ warn = 1; if (warn==0||Popup::YesNoHeadline(_("Warning"),msg)==true) { y2milestone ("--- Calling disk_worker %1 ---", WFM::Args()); - ret = WFM::call("disk_worker", WFM::Args()); + any ret = WFM::call("disk_worker", WFM::Args()); y2milestone ("--- Returned: %1 ---", ret); } else { - y2milestone ("User decided not to run storage..."); + y2milestone ("User decided not to run disk..."); } Wizard::CloseDialog(); - } else { + } + else + { y2milestone ("--- Calling disk_worker %1 ---", WFM::Args()); - ret = WFM::call("disk_worker", WFM::Args()); + any ret = WFM::call("disk_worker", WFM::Args()); y2milestone ("--- Returned: %1 ---", ret); } Modified: trunk/storage/disk/src/disk_worker.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/disk/src/disk_worker.ycp… ============================================================================== --- trunk/storage/disk/src/disk_worker.ycp (original) +++ trunk/storage/disk/src/disk_worker.ycp Fri Aug 1 10:57:04 2008 @@ -16,40 +16,35 @@ * Wrapper file for inst_disk.ycp * */ - { + textdomain "storage"; -/*** - * <h3>Configuration of the disk</h3> - */ + import "CommandLine"; + import "Storage"; - textdomain "storage"; - import "CommandLine"; - import "StorageClients"; - import "Popup"; - import "Storage"; - -define any DiskSequence () { - Storage::SwitchUiAutomounter( false ); - any ret = WFM::CallFunction("inst_disk", [ true, true ]); - Storage::SwitchUiAutomounter( true ); - Storage::SaveUsedFs(); + any DiskSequence() + { + Storage::SwitchUiAutomounter(false); + any ret = WFM::CallFunction("inst_disk", [ true, true ]); + Storage::SwitchUiAutomounter(true); + Storage::SaveUsedFs(); + + return ret; + } - return ret; -} -/* -- the command line description map -------------------------------------- */ -map cmdline = $[ - "id" : "disk", - // translators: command line help text for disk module - "help" : _("Disk partitioner"), - // custum help text (should replace default one) - "customhelp" : _("Command line interface for the partitioner module is not available"), - "guihandler" : DiskSequence, -]; + /* -- the command line description map -------------------------------------- */ + map cmdline = $[ + "id" : "disk", + // translators: command line help text for disk module + "help" : _("Disk partitioner"), + // custum help text (should replace default one) + "customhelp" : _("Command line interface for the partitioner module is not available"), + "guihandler" : DiskSequence, + ]; -CommandLine::Run (cmdline); -return true; + CommandLine::Run(cmdline); + return true; } Modified: trunk/storage/lvm/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/lvm/src/Makefile.am?rev=… ============================================================================== --- trunk/storage/lvm/src/Makefile.am (original) +++ trunk/storage/lvm/src/Makefile.am Fri Aug 1 10:57:04 2008 @@ -10,6 +10,4 @@ lvm_config.ycp \ lvm_config_ui.ycp -desktop_DATA = lvm_config.desktop - -EXTRA_DIST = $(client_DATA) $(desktop_DATA) +EXTRA_DIST = $(client_DATA) Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Aug 1 10:57:04 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 01 10:42:52 CEST 2008 - aschnell(a)suse.de + +- redesigned expert partitioner (fate #302054) +- added dialog to choose partition table type (fate #303924) +- version 2.17.8 + +------------------------------------------------------------------- Thu Jul 31 15:29:12 CEST 2008 - aschnell(a)suse.de - recognise NetBSD partitions (bnc #412244) Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Fri Aug 1 10:57:04 2008 @@ -29,6 +29,7 @@ import "Mode"; import "Arch"; import "Label"; + import "Popup"; ////////////////////////////////////////////////////////////////////////////// // Dialog Password for Crypted FS @@ -346,10 +347,10 @@ * @parm new_val map that contains a partition * @parm file_systems filesystem definitions */ -define map FileSystemOptions( map< any, map<string,any> > org_fs_options, - map fs_define ) +map <any, map<string, any> > FileSystemOptions(map< any, map<string,any> > org_fs_options, + map fs_define) ``{ - y2milestone( "FileSystemOptions org_fs_options %1", org_fs_options ); + y2milestone( "FileSystemOptions org_fs_options:%1 fs_define:%2", org_fs_options, fs_define ); map<any, map<string,any> > fs_options = org_fs_options; term contents = `VBox(`VSpacing (1)); string helptext = ""; @@ -620,33 +621,32 @@ y2milestone( "FstabOptions old_state=%1", old_state ); UI::OpenDialog( `opt(`decorated), - `HBox( - `HWeight(4, `RichText( helptext )), - `HWeight(7, - `VBox( - `HSpacing(50), - // heading text - `Left(`Heading(_("Fstab options:"))), - `VStretch(), - `VSpacing(1), - `HBox(`HStretch(), - `HSpacing(1), - contents, - `HStretch(), - `HSpacing(1)), - `VSpacing(1), - `VStretch(), - `HBox( - `Bottom(`PushButton(`id(`ok), - `opt(`default), - Label::OKButton())), - `Bottom(`PushButton(`id(`cancel), - Label::CancelButton())) - ) - ) - ) - ) + `VBox ( + `HSpacing(50), + // heading text + `Left(`Heading(_("Fstab options:"))), + `VStretch(), + `VSpacing(1), + `HBox(`HStretch(), + `HSpacing(1), + contents, + `HStretch(), + `HSpacing(1)), + `VSpacing(1), + `VStretch(), + `HBox( + `Left(`PushButton(`id(`help),`opt(`helpButton), Label::HelpButton())), + `Right(`HBox ( + `PushButton(`id(`ok), + `opt(`default), + Label::OKButton()), + `PushButton(`id(`cancel), + Label::CancelButton())) + ) + ) + ) ); + if( UI::WidgetExists( `id(`mt_group) )) { list no_mountby_type = [ `loop ]; @@ -706,6 +706,10 @@ { ret = UI::UserInput(); y2milestone( "FstabOptions ret %1", ret ); + if( ret == `help) + { + Popup::LongText(_("Fstab Options Help"), `RichText(helptext), 50,20); + } if( ret == "opt_noauto" ) { if( UI::WidgetExists( `id("opt_user") )) @@ -912,7 +916,7 @@ if( !Arch::s390 () ) { boolean cr = new_val["enc_type"]:`none != `none; - CryptWidget = `VBox( `VSpacing(0.7), + CryptWidget = `VBox( // `VSpacing(0.7), `Left(`CheckBox(`id(`crypt_fs), `opt(`notify), // button text _("&Encrypt file system"), cr ))); @@ -923,9 +927,9 @@ `ComboBox(`id(`fs), `opt(`hstretch, `notify), // label text _("File &system"), filesystems )), - `PushButton( `id(`fs_options ),`opt(`hstretch), + `PushButton( `id(`fs_options ), `opt(`hstretch), // button text - _("O&ptions") ), + _("O&ptions...") ), CryptWidget ); } @@ -1593,62 +1597,57 @@ }; -define symbol ReallyInstPrepdisk( ) - ``{ - map<string,map> targetMap = Storage::GetTargetMap(); +symbol ReallyInstPrepdisk() +{ symbol ret = `none; string doto = Storage::ChangeText(); - y2milestone( "ReallyInstPrepdisk doto:%1", doto ); - term dlg = `Empty(); - if( size(doto) == 0 ) - { + y2milestone("ReallyInstPrepdisk doto:%1", doto); + + if (size(doto) == 0) + { // popup text - Popup::Message( _("No unsaved changes exist.")); + Popup::Message(_("No unsaved changes exist.")); ret = `back; - } + } else - { - dlg = `VBox( `VSpacing(1), - `HSpacing(60), - // label text - `Left(`Heading(_("Changes:"))), - `RichText( doto ) ); + { + term dlg = `VBox(`VSpacing(1), + `HSpacing(60), + // label text + `Left(`Heading(_("Changes:"))), + `RichText(doto)); UI::OpenDialog(`opt(`decorated, `warncolor), `HBox( - `HSpacing(1), - `VBox( - dlg, - `VSpacing(1), - // popup text - `Heading(_(" Do you really want to execute these changes?")), - `VSpacing(1), - - `HBox( - // all right, start installation *now* - - `PushButton(`id(`back), Label::CancelButton()), - `HStretch(), - // button text - `PushButton(`id(`apply), _("&Apply")), - `PushButton(`id(`finish), Label::FinishButton() ) - // no, don't go on, i just changed my mind - ), - `VSpacing(0.2) + `HSpacing(1), + `VBox( + dlg, + `VSpacing(1), + // popup text + `Heading(_(" Do you really want to execute these changes?")), + `VSpacing(1), + `HBox( + `PushButton(`id(`back), Label::CancelButton()), + `HStretch(), + // button text + `PushButton(`id(`apply), _("&Apply")), + `PushButton(`id(`finish), Label::FinishButton() ) ), - `HSpacing(1) - ) - ); + `VSpacing(0.2) + ), + `HSpacing(1) + ) + ); - ret = (symbol)UI::UserInput(); + ret = (symbol) UI::UserInput(); UI::CloseDialog(); - } + } - y2milestone( "ReallyInstPrepdisk ret=%1", ret ); + y2milestone("ReallyInstPrepdisk ret=%1", ret); return ret; - }; +} /** Modified: trunk/storage/storage/src/include/lvm_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_lib.ycp Fri Aug 1 10:57:04 2008 @@ -15,8 +15,9 @@ * */ - { - +{ + import "Integer"; + include "partitioning/partition_defines.ycp"; include "partitioning/signatures.ycp"; @@ -35,12 +36,11 @@ ////////////////////////////////////////////////////////////////////// // get a list of all volume groups in the targetMap -define list get_vgs( map<string,map> targetMap ) - ``{ - list lvm_vg = []; +list<string> get_vgs( map<string,map> targetMap ) +{ + list<string> lvm_vg = []; - foreach( string dev, map devmap, targetMap, - ``{ + foreach( string dev, map devmap, targetMap, { if ( devmap["type"]:`CT_UNKNOWN==`CT_LVM ) { // add a found volume group @@ -48,7 +48,7 @@ } }); return( lvm_vg ); - }; +}; ////////////////////////////////////////////////////////////////////// // pesize to byte @@ -56,35 +56,17 @@ // // return "0" if input is invalid // -// pesize is valid 8K to 512M in power of 2 -// 8 is 8k -// 16K == 16k == 16KB == 16kb -define integer pesize_str_to_byte( string input ) - ``{ - integer num = kmgt_str_to_byte( input ); - if( findfirstnotof( input, "0123456789 " ) == nil ) - num = num*1024; - - integer ret = num; +// pesize is valid 8kB to 512MB in power of 2 +define integer pesize_str_to_byte(string input) +{ + integer ret = kmgt_str_to_byte(input); - if( ret % 1024 != 0 ) + if (!Integer::IsPowerOfTwo(ret)) ret = 0; - else - { - while( num>1 && ret>0 ) - { - if( num%2 != 0 ) - ret = 0; - else - num = num/2; - } - } - if( ret < 8*1024 || ret > 524288*1024 ) - { + else if (ret < 8*1024 || ret > 512*1024*1024) ret = 0; - } - return( ret ); - }; + return ret; +}; ////////////////////////////////////////////////////////////////////// Modified: trunk/storage/storage/src/include/lvm_lv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_lv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_lv_lib.ycp Fri Aug 1 10:57:04 2008 @@ -191,12 +191,12 @@ //////////////////////////////////////////////////////////////////////////////// // Get all existing lv names of a volume group -define list get_lv_names( map<string,map> targetMap, string current_vg ) - ``{ - list<map> part = targetMap["/dev/"+current_vg,"partitions"]:[]; - list ret = maplist( map e, part, ``(e["name"]:"") ); - return( ret ); - }; +list<string> get_lv_names(map<string, map> target_map, string vg_name) +{ + list<map> parts = target_map["/dev/" + vg_name, "partitions"]:[]; + list<string> ret = maplist(map part, parts, { return part["name"]:""; }); + return ret; +}; ////////////////////////////////////////////////////////////////////// // partition list to widget table Modified: trunk/storage/storage/src/include/lvm_pv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_pv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_pv_lib.ycp Fri Aug 1 10:57:04 2008 @@ -161,7 +161,6 @@ ///////////////////////////////////////////////////////////////// // Get all partitions, we can probably use as physical volumes // Add needed information: disksize - define list<map> get_possible_pvs( map<string,map> targetMap ) ``{ list<map> ret = []; Modified: trunk/storage/storage/src/include/partition_defines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/part… ============================================================================== --- trunk/storage/storage/src/include/partition_defines.ycp (original) +++ trunk/storage/storage/src/include/partition_defines.ycp Fri Aug 1 10:57:04 2008 @@ -26,7 +26,7 @@ import "Partitions"; import "FileSystems"; import "Report"; - + import "String"; import "Popup"; // include "partitioning/custom_part_testdata.ycp"; @@ -64,64 +64,24 @@ }; - /*--------------------------------------------------------------------- - * returns for a string a string with a minimum of 9 characters: - * "1" -> " 1" - * "22" -> " 22" - * "145" -> " 145" - * "2134" -> " 2134" - *---------------------------------------------------------------------- - */ - define string sto8string( string str ) - ``{ - integer nb = size( str ); - if ( nb > 8 ) return( sformat( "%1", str )); - if ( nb > 7 ) return( sformat( " %1", str )); - if ( nb > 6 ) return( sformat( " %1", str )); - if ( nb > 5 ) return( sformat( " %1", str )); - if ( nb > 4 ) return( sformat( " %1", str )); - if ( nb > 3 ) return( sformat( " %1", str )); - if ( nb > 2 ) return( sformat( " %1", str )); - if ( nb > 1 ) return( sformat( " %1", str )); - return( sformat( " %1", str )); - }; - /*--------------------------------------------------------------------- * Convert <number-of-bytes> to XXX.X MB or XXX.X GB or XXX.X TB * * see also ByteToHumanStringWithZero ! * Return value: string "unknown" if input == 0 *---------------------------------------------------------------------- + * TODO: remove */ -define string ByteToHumanString ( integer number ) - ``{ - // column description, if disk space is not known - if( number == 0 ) return( _("unknown") ); - - if( number < 1073741824 ) - { - // < 1 GB - integer MB = number / 1048576; - integer hunKB = (number - (MB * 1048576)) / 104858; - return( sto8string(sformat( "%1.%2 MB", MB,hunKB ))); - } - else if ( number < 1099511627776 ) - { - // < 1 TB - integer GB = number / 1073741824; - integer hunMB = (number - (GB * 1073741824)) / 107374183; - return( sto8string(sformat( "%1.%2 GB", GB,hunMB ))); - } - else - { - // >= 1 TB - integer TB = number / 1099511627776; - integer hunGB = (number - (TB * 1099511627776)) / 109951162778; - return( sto8string(sformat( "%1.%2 TB", TB,hunGB ))); - } - }; - +string ByteToHumanString(integer number) +{ + if (number == 0) + { + // column description, if disk space is not known + return _("unknown"); + } + return String::FormatSizeWithPrecision(number, 2, false); +}; /*--------------------------------------------------------------------- @@ -163,23 +123,20 @@ * see also ByteToHumanString ! * Return value: string "0" if input == 0 *---------------------------------------------------------------------- + * TODO: remove */ -define string ByteToHumanStringWithZero ( integer number ) - ``{ - // string or locale - string ret = ByteToHumanString( number ); - - // label text - if( ret == _("unknown") ) - { +string ByteToHumanStringWithZero(integer number) +{ + if (number == 0) + { // label text, short for Megabyte (MB) - return( "0 " + _("MB") ); - } + return "0 " + _("MB"); + } else - { - return( ret ); - } - }; + { + return ByteToHumanString(number); + } +}; /*--------------------------------------------------------------------- Modified: trunk/storage/storage/src/include/raid_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/raid… ============================================================================== --- trunk/storage/storage/src/include/raid_lib.ycp (original) +++ trunk/storage/storage/src/include/raid_lib.ycp Fri Aug 1 10:57:04 2008 @@ -372,4 +372,3 @@ } } - Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Fri Aug 1 10:57:04 2008 @@ -64,20 +64,6 @@ include "partitioning/evms_lib.ycp"; - // Which columns show the main window have - boolean showT_dev = true; // show /dev/hda1 - boolean showT_id = false; // s390 show FD01 - boolean showT_cyl = true; // show start and endcyl - boolean showT_size = true; // show size of partition - boolean showT_format = true; // show format flag - boolean showT_fs = true; // show filesystem - boolean showT_mount = true; // show mountpoint - boolean showT_mby = true; // show mount by - boolean showT_Used = true; // show using entity - boolean showT_Label = true; // show assigned label - boolean showT_udev_id = true; // show persistent id - boolean showT_udev_path = true; // show persistent path - // hide some details in the table by default boolean show_T_details = Storage::GetExpertDetail(); @@ -126,13 +112,11 @@ if( Arch::ppc () ) { - showT_cyl = false; bsd_label = false; } if( Arch::s390 () ) { - showT_id = true; button_resize = false; button_loop = false; } @@ -872,314 +856,6 @@ }; - /*--------------------------------------------------------------------- - * returns for nonnegative numbers a string with a minimum of 4 characters: - * 1 -> " 1" - * 22 -> " 22" - * 145 -> " 145" - * 2134 -> "2134" - * 34111 -> "34111" - *---------------------------------------------------------------------- - */ -define string to4string( integer nb ) - ``{ - if ( nb < 10 ) return( sformat( " %1", nb )); - if ( nb < 100 ) return( sformat( " %1", nb )); - if ( nb < 1000 ) return( sformat( " %1", nb )); - return( sformat( "%1", nb )); - }; - -define string usedByString( symbol ub_type, string used_by ) - { - string ret = ""; - if( ub_type == `UB_LVM ) - ret = "LVM " + used_by; - else if( ub_type == `UB_EVMS ) - ret = "EVMS " + used_by; - else if( ub_type == `UB_DM ) - ret = "DM " + used_by; - else if( ub_type == `UB_DMRAID ) - ret = "RAID " + used_by; - else if( ub_type != `UN_NONE ) - ret = used_by; - return( ret ); - } - - /*--------------------------------------------------------------------- - * Fill the selection box with ID 'selbox_id' inside widget tree - * 'widget' with disk and partition info from 'all_disks'. - * - * Return value: - * term contents = `VBox(`Label("Partitions"), - * `Table(`header("Device", "Start", "End", "Size", "F", "Type", "Mount", "RAID" , "LVM" ), - * [ - * `item(`id("/dev/hda"), "/dev/hda", "8.5 GB", " ", "Seagate ST 48012", " ", "1", "1115" ,"", ""), - * `item(`id("1//dev/hda"), " /dev/hda1", "509.8 MB", " ", "FAT16", " ", "1", "65" ,"", ""), - * `item(`id("2//dev/hda"), " /dev/hda2", "666.7 MB", " ", "NTFS", " ", "66", "150" ,"", ""), - * `item(`id("3//dev/hda"), " /dev/hda3", "5.5 GB", " ", "Extended", " ", "301","1024" ,"", ""), - * `item(`id("4//dev/hda"), " /dev/hda5", "7.8 MB", "F", "Linux ", "/boot", "301","302" ,"", ""), - * `item(`id("5//dev/hda"), " /dev/hda6", "7.8 MB", "", "Linux LVM ", "", "303","304" ,"", "system"), - * `item(`id("6//dev/hda"), " /dev/hda7", "7.8 MB", "", "Linux RAID ", "", "305","307" ,"/dev/md1", ""), - * ] )) ; - * - * PPC: without Start End - * - *---------------------------------------------------------------------- - */ - -define list FillPartitionList(map<string,map> targets) - ``{ - list<term> table_input = []; - boolean log_mode = false; - - // order should be md, then loop, then LVM, then EVMS - map disk_order = $[ `CT_DMRAID : 0, `CT_DISK : 1, `CT_MD : 2, `CT_LOOP : 3, - `CT_LVM : 4, `CT_EVMS : 5, `CT_DM : 6, `CT_NFS : 7 ]; - list<string> keys = maplist( string dev, map disk, targets, - ``{return(dev);} ); - keys = sort( string a, string b, keys, - ``{ - integer oa = disk_order[targets[a,"type"]:`CT_UNKNOWN]:8; - integer ob = disk_order[targets[b,"type"]:`CT_UNKNOWN]:8; - return( (oa==ob) ? (a<b) : (oa<ob) ); - }); - - SCR::Write(.target.ycp,Storage::SaveDumpPath("targetMap_c"), targets ); - foreach( string dev, keys, - ``{ - map disk = targets[dev]:$[]; - boolean real_disk = Storage::IsPartitionable( disk ); - integer cyl_count = disk["cyl_count"]:0; - integer cyl_size = disk["cyl_size"]:1000000; - string vendor = disk["vendor"]:""; - string model = disk["model"]:""; - string dev_size = ByteToHumanString(disk["size_k"]:0*1024); - string dev_start_cyl = to4string(0); - string dev_nb_cyl = to4string(cyl_count==0?cyl_count:(cyl_count-1)); - string udev_id = mergestring( disk["udev_id"]:[], " "); - string udev_path = disk["udev_path"]:""; - - if ( (model != "") && (vendor != "") ) - vendor = vendor + "-" + model; - else - vendor = vendor + model; - - // entry in column "Type" for a unknown disk - if( vendor == "" ) - { - if (disk["bus"]:"" == "RAID") - { - vendor = "RAID "+dev; - } - else if( disk["type"]:`CT_UNKNOWN==`CT_LVM ) - { - vendor = "LVM" + (disk["lvm2"]:false ? "2 " : " ") + - disk["name"]:""; - } - else if( disk["type"]:`CT_UNKNOWN==`CT_EVMS ) - { - vendor = "EVMS " + disk["name"]:""; - } - else if( disk["type"]:`CT_UNKNOWN==`CT_DMRAID ) - { - vendor = "BIOS RAID " + disk["name"]:""; - } - else - // label text - vendor = sformat( _("DISK %1"), substring( dev, 5 )); - } - - boolean id_sw_raid_dev = (dev == "/dev/md"); - - ///////////////////////////////////////////////////////////// - // Insert line for the entire disk into selection box widget - // Look, if for the architecture disk, and Cylinder are shown - - if( !real_disk ) - { - dev_nb_cyl = " -- "; - dev_start_cyl = " -- "; - } - - if( show_disk && - !(disk["type"]:`CT_UNKNOWN==`CT_DISK && !real_disk) && - (disk["type"]:`CT_UNKNOWN==`CT_DISK || - disk["type"]:`CT_UNKNOWN==`CT_DMRAID || - disk["type"]:`CT_UNKNOWN==`CT_LVM || - (disk["type"]:`CT_UNKNOWN==`CT_EVMS && size(disk["name"]:"")>0 && - (!haskey( targets, "/dev/"+substring( disk["name"]:"", search( disk["name"]:"", "/")+1 ))|| - disk["create"]:false)))) - { - y2milestone( "disk:%1", disk ); - term a = `item(`id(dev)); - - if( showT_dev ) a = add(a, dev ); - if( showT_id ) a = add(a, sformat( " (%1)", - disk["bios_id"]:"" ) ); - if( showT_size ) a = add(a, dev_size ); - if( showT_format ) a = add(a, (disk["dasdfmt"]:false)?"X":" " ); - if( showT_fs ) a = add(a, vendor); - if( showT_mount ) a = add(a, "" ); - if( show_T_details && showT_mby ) a = add(a, ""); - if( show_T_details && showT_cyl ) a = add(a, dev_start_cyl ); - if( show_T_details && showT_cyl ) a = add(a, dev_nb_cyl ); - if( showT_Used ) a = add(a, usedByString( disk["used_by_type"]:`UB_NONE, - disk["used_by"]:"" )); - if( showT_Label ) a = add(a, ""); - if( show_T_details && showT_udev_id ) a = add(a, udev_id); - if( show_T_details && showT_udev_path ) a = add(a, udev_path); - - table_input = add( table_input, a ); - } - - ///////////////////////////////////////////////////////////// - // Now we come to the partitions ... - - list<map> partitions = disk["partitions"]:[]; - - foreach( map partition, partitions, - ``{ - // dont show "system partitions" - string fstype = partition["fstype"]:""; - boolean hide = partition["fsid"]:0 == Partitions::fsid_mac_hidden || - disk["used_by_type"]:`UB_NONE==`UB_DMRAID; - if( !hide && search( partition["device"]:"", "/dev/evms/" )==0 ) - { - y2milestone( "evms p: %1", partition ); - string d1 = evms_dev_disk( partition["device"]:"" ); - y2milestone( "evms d1:%1", d1 ); - integer val = search( d1, "/lvm/" ); - if( val!=nil && val>0 ) - { - d1 = "/dev/" + substring( d1, 9 ); - } - else - { - val = search( d1, "/lvm2/" ); - if( val!=nil && val>0 ) - { - d1 = "/dev/" + substring( d1, 10 ); - } - } - hide = size(partition["mount"]:"")==0; - if( hide ) - { - y2milestone( "evms p: %1", Storage::GetPartition( targets, d1 )); - hide = (size(Storage::GetPartition( targets, d1 ))>0|| - Storage::IsPartType(targets[d1,"type"]:`CT_UNKNOWN)) && - !partition["evms_native"]:false; - } - y2milestone( "evms d1:%1 hide:%2", d1, hide ); - } - if( !hide || log_mode ) - { - string part_id = ""; - - string part_dev_name = partition["device"]:""; - string id = part_dev_name; - - //////////////////////////////////////////////////////////// - // Format other Colums: - - integer start_cyl = partition["region",0]:0; - integer nb_cyl = partition["region",1]:0; - symbol type = partition["type"]:`unknown; - boolean format = partition["format"]:false; - boolean crypt_fs = partition["enc_type"]:`none != `none; - symbol used_fs = partition["used_fs"]:`unknown; - string mount_point = partition["mount"]:""; - symbol mount_by = partition["mountby"]:`device; - string filesystem_name = ""; - string label = partition["label"]:""; - string udev_id = mergestring( partition["udev_id"]:[], " "); - string udev_path = partition["udev_path"]:""; - - string used_by = - usedByString( partition["used_by_type"]:`UB_NONE, - partition["used_by"]:"" ); - - filesystem_name = partition["fstype"]:""; - - if( format && partition["fsid"]:0 == Partitions::fsid_native) - { - string fs_name = FileSystems::GetName( used_fs, "Ext2" ); - filesystem_name = filesystem_name + " (" + fs_name + ") "; - } - - string format_flag = ""; - if ( format ) format_flag = "F"; - if ( crypt_fs ) format_flag = "C" + format_flag; - - string bytes_of_part = - ByteToHumanString( partition["size_k"]:0*1024 ); - - ///////////////////////////////////////////////////// - // Insert line for this partition into selection box widget - // - // Start- and EndCly are shown (intel) or not (ppc) ... - - term a = `item(`id(id)); - - if( showT_dev ) a = add(a, part_dev_name ); - if( showT_id ) a = add(a, part_id ); - if( showT_size ) a = add(a, bytes_of_part); - if( showT_format ) a = add(a, format_flag); - if( showT_fs ) a = add(a, filesystem_name); - if( showT_mount ) - { - string tmp = mount_point; - if( Mode::normal() && partition["inactive"]:false ) - { - tmp = tmp + " *"; - } - a = add(a, tmp ); - } - if( show_T_details && showT_mby ) - { - if (size (mount_point) > 0) - { - map tmp = $[ `device : "K", `uuid : "U", `label : "L", - `id : "I", `path : "P" ]; - a = add(a, tmp[mount_by]:""); - } - else - a = add(a, ""); - } - if( show_T_details && showT_cyl ) - { - if( real_disk ) - { - a = add(a, to4string(start_cyl)); - integer num = start_cyl + nb_cyl - 1; - if( num<0 ) - num=0; - a = add(a, to4string(num)); - } - else - { - a = add(a, " -- "); - a = add(a, " -- "); - } - } - if( showT_Used ) a = add(a, used_by); - if( showT_Label ) a = add(a, label); - - if( show_T_details && showT_udev_id ) a = add(a, udev_id); - if( show_T_details && showT_udev_path ) a = add(a, udev_path); - - table_input = add( table_input, a ); - } - else - { - // as deleted marked - // y2debug( "ddddddddddddd----"); - } - }); - }); - - return( table_input ); - }; - /*------------------------------------------------------------------- * * Now check start an end cylinder @@ -2401,53 +2077,6 @@ return( "---" ); }; -define term GetTableHeader () { - term header = `header(); - - // Column header - if ( showT_dev ) header = add( header, _("Device")); - - // Column header - if ( showT_id ) header = add( header, _("ID")); - - // Column header: centered / minimum = 11 characters / - // fill with space if needed - if ( showT_size ) header = add( header, `Right(_(" Size "))); - - // Column header: centered / minimum = 3 characters / - // fill with space if needed - if ( showT_format ) header = add( header, `Right(_(" F "))); - - // Column header - if ( showT_fs ) header = add( header, _("Type")); - - // Column header: centered / minimum = 7 characters / - // fill with space if needed - if ( showT_mount ) header = add( header, _(" Mount ")); - - // Column header - if ( show_T_details && showT_mby ) header = add( header, _("Mount By")); - - // Column header: minimum = 5 characters fill with space if needed - if ( show_T_details && showT_cyl ) header = add( header, `Right(_("Start"))); - - // Column header: minimum = 4 characters fill with space if needed - if ( show_T_details && showT_cyl ) header = add( header, `Right(_("End "))); - - // Column header - if ( showT_Used ) header = add( header, `Left(_("Used By"))); - - // Column header - if ( showT_Label ) header = add( header, `Left(_("Label"))); - - // Column header - if ( show_T_details && showT_udev_id ) header = add( header, `Left(_("Device ID"))); - - // Column header - if ( show_T_details && showT_udev_path ) header = add( header, `Left(_("Device Path"))); - - return header; -} /*--------------------------------------------------------------------- * Make a output string for "you can not create a partition, because: " @@ -2503,6 +2132,18 @@ // MAIN: ///////////////////////////////////////////////////////////////// + + + + if (true) + { + include "partitioning/ep-main.ycp"; + return test_new_ep(); + } + + + + symbol ret = nil; y2milestone( "Custom partitioner started" ); @@ -2512,7 +2153,6 @@ Storage::GetTargetMap() ); map<string,map> tg = Storage::GetTargetMap(); - list table_list = FillPartitionList(tg); if( !Storage::CheckBackupState("custom_part") ) { @@ -2623,16 +2263,6 @@ `CheckBox (`id(`show_table_details), `opt(`notify), _("&Show Details"), show_T_details) ); - term contents = `VBox( `VSpacing(0.5), - `ReplacePoint( - `id(`table_rp), - `Table( `id(`table), `opt(`notify,`keepSorting), - GetTableHeader(), table_list ) - ), - details_checkbox, - buttonline_a, - buttonline_b ) ; - string help_text = ""; if( Arch::s390 () ) { @@ -2660,8 +2290,8 @@ } // heading text - Wizard::SetContentsButtons(_("Expert Partitioner"), contents, help_text, - back_label, next_label ); + // Wizard::SetContentsButtons(_("Expert Partitioner"), contents, help_text, + // back_label, next_label ); ////////////////////////////////////////////////////////////////// @@ -2671,8 +2301,8 @@ repeat { map<string,map> tg = Storage::GetTargetMap(); - table_list = FillPartitionList(tg); - UI::ChangeWidget(`id(`table), `Items, table_list); + // table_list = FillPartitionList(tg); + // UI::ChangeWidget(`id(`table), `Items, table_list); /////////////////////////////////////////////////////// // Now set the focus @@ -2695,11 +2325,7 @@ if( ret==`show_table_details ) { - show_T_details = (boolean) UI::QueryWidget(`id(`show_table_details), `Value); - UI::ReplaceWidget( `id(`table_rp), - `Table( `id(`table), `opt(`notify,`keepSorting), - GetTableHeader(), [] )); - continue; + continue; } @@ -3112,137 +2738,6 @@ ///////////////////////////////////////////////////////////// if (ret == `delete) { - map<string,any> part = $[]; - string id = (string)UI::QueryWidget( `id(`table), `CurrentItem); - map<string,any> disk = Storage::GetDisk( tg, id ); - - if( !haskey( tg, id ) ) - part = Storage::GetPartition( tg, id ); - y2milestone( "id:%1 part:%2", id, part ); - if( !haskey( tg, id ) && size(part)==0 ) - { - ret = `again; - continue; - } - - if( disk["readonly"]:false ) - { - Popup::Error( Partitions::RdonlyText( disk["device"]:"", true )); - ret = `again; - continue; - } - - if( haskey( tg, id ) ) - { - if( tg[id,"type"]:`CT_UNKNOWN == `CT_MD ) - { - ret = `again; - continue; - } - else if( tg[id,"type"]:`CT_UNKNOWN == `CT_LVM ) - { - string current_vg = substring( tg[id,"device"]:"", 5 ); - HandleRemoveVg( tg, current_vg ); - } - else if( tg[id,"type"]:`CT_UNKNOWN == `CT_DMRAID ) - { - if( Popup::YesNo( sformat(_("Really delete BIOS RAID %1?"), id ))) - { - if( deleteAllDevPartitions( disk, Stage::initial(), bsd_label )) - Storage::DeleteDmraid( id ); - } - } - // YesNo popup text %1 is replaced by a disk name e.g. /dev/hda - else if( Popup::YesNo( sformat(_("Really delete all partitions on %1?"), id ))) - { - focusline = id; - deleteAllDevPartitions( disk, Stage::initial(), bsd_label ); - } - } - else if( part["type"]:`unknown==`lvm ) - { - if( !check_device_delete( part, false, Stage::initial(), $[] )) - { - ret = `again; - continue; - } - else - HandleRemoveLv( tg, id ); - } - else - { - ///////////////////////////////////////////////////// - // delete algorithm: - // if you find newly created (but until now not realy - // written) partition (sign: "create = true"): delete it - // else there must be already existing partition: mark it - // with "delete = true" - - focusline = id; - - y2milestone( "delete part %1", part ); - ///////////////////////////////////////////////////// - // check if the partition can be deleted - - if( part["type"]:`primary == `extended && - !check_extended_delete( disk, Stage::initial() )) - { - ret = `again; - continue; - } - if( part["type"]:`primary != `extended && - !check_device_delete( part, bsd_label, Stage::initial(), - disk )) - { - ret = `again; - continue; - } - - ///////////////////////////////////////////////////// - // now delete partition!! - - // YesNo popup text, %1 is replaced by a device name e.g. /dev/hda1 - if( Popup::YesNo( sformat(_("Really delete %1?"), - part["device"]:"" ))) - { - if( (search( id, "/dev/loop")==0 || - search( id, "/dev/mapper/")==0) && - size(part["fpath"]:"")>0 && - Mode::normal() && - // YesNo popup. %1 is path to a file - Popup::YesNo( sformat(_("\nShould the loop file %1 also be removed? -"), part["fpath"]:"" ))) - { - Storage::DeleteLoop( disk["device"]:"", - part["fpath"]:"", true ); - } - if( part["type"]:`unknown == `nfs ) - { - Storage::DeleteDevice( "/dev/nfs", - part["device"]:"" ); - } - else - { - Storage::DeleteDevice( disk["device"]:"", - part["device"]:"" ); - } - focusline = Storage::GetIdSmaller( disk["device"]:"", - part["nr"]:0 ); - } - if( search( id, "/dev/md" )==0 ) - { - map raid = Storage::GetDisk( Storage::GetTargetMap(), "/dev/md" ); - UI::ReplaceWidget( `id(`raid_button), - RaidButton(size(raid["partitions"]:[])) ); - } - else if( search( id, "/dev/loop" )==0 || - search( id, "/dev/mapper/" )==0 ) - { - map dev = Storage::GetDisk( Storage::GetTargetMap(), "/dev/loop" ); - UI::ReplaceWidget( `id(`loop_button), - LoopButton(size(dev["partitions"]:[])) ); - } - } } Modified: trunk/storage/storage/src/inst_disk.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_disk.yc… ============================================================================== --- trunk/storage/storage/src/inst_disk.ycp (original) +++ trunk/storage/storage/src/inst_disk.ycp Fri Aug 1 10:57:04 2008 @@ -17,207 +17,68 @@ * Main file for disk configuration. Uses all other files. * */ - { + textdomain "storage"; -/*** - * <h3>Configuration of the disk</h3> - */ - y2milestone( "start disk"); + import "Wizard"; + import "Mode"; + import "Storage"; + import "StorageClients"; + -import "Arch"; -import "Wizard"; -import "Mode"; -import "Storage"; -import "StorageClients"; -import "Sequencer"; - -textdomain "storage"; - -include "partitioning/signatures.ycp"; -include "partitioning/custom_part_helptexts.ycp"; -include "partitioning/custom_part_dialogs.ycp"; -include "partitioning/custom_part_lib.ycp"; -include "partitioning/raid_lib.ycp"; -include "partitioning/raid_ui.ycp"; -include "partitioning/loop.ycp"; -include "partitioning/lvm_pv_lib.ycp"; -include "partitioning/partition_defines.ycp"; -include "partitioning/custom_part_check_generated.ycp"; + y2milestone("start inst_disk"); y2milestone( "PartMode %1 ProposalActive %2 ", Storage::GetPartMode(), Storage::GetPartProposalActive() ); if( !Storage::GetCustomDisplay() && Storage::GetPartMode() != "CUSTOM" && - Storage::GetPartMode() != "PROP_MODIFY" ) - return Storage::GetExitKey(); - - if( !Storage::CheckBackupState("disk")) - Storage::CreateTargetBackup("disk"); - - - boolean installation = Stage::initial (); - - y2milestone( " running in instsys %1", installation ); - - -define symbol InitSettings( boolean in ) - ``{ - return `next; + Storage::GetPartMode() != "PROP_MODIFY" ) + { + symbol ret = Storage::GetExitKey(); + y2milestone("end inst_disk ret:%1", ret); + return ret; } - map aliases = $[ - "RaidTypeWizard" : ``(ChooseRaidType(`wizard )), - "RaidDeviceWizard" : ``(RaidDevices(`wizard )), - "RaidDeviceSettings" : ``(RaidDevices(`settings)), - "LoopCreateWizard" : ``(LoopSetup(false)), - "LoopEditWizard" : ``(LoopSetup(true)), - "RaidExpertWizard" : ``(RaidExpertWizard()), - "RaidMpAutodetect" : ``(RaidMultipathAuto()), - "ReallyInstPrepdisk" : ``(ReallyInstPrepdisk()), - "LvmPv" : ``(WFM::CallFunction("inst_lvm_pv", [true, true])), - "LvmLv" : ``(WFM::CallFunction("inst_lvm_lv", [true, true])), - "S390Zfcp" : ``(WFM::call("xfcp")), - "S390Dasd" : ``(WFM::call("dasd")), - "Evms" : ``(WFM::CallFunction("inst_evms", [true, true])), - "Custom" : ``(WFM::CallFunction("inst_custom_part", [true, true])), - "PrepDiskEnd" : ``(WFM::CallFunction("inst_prepdisk", [true, true])), - "PrepDiskApply" : ``(WFM::CallFunction("inst_prepdisk", [true, true])), - "ReInitSettings" : ``(InitSettings(installation)), - "abort" : ``(AbortDialog()) - ]; - - - map sequence = $[ - "ws_start" : "Custom", - - "RaidTypeWizard" : $[ `abort : "abort", - `cancel : `cancel, - `mp_auto : "RaidMpAutodetect", - `next : "RaidDeviceWizard" ], - - "RaidDeviceWizard" : $[ `abort : "abort", - `cancel : `cancel, - `next : "RaidExpertWizard" ], - - "RaidMpAutodetect" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "RaidExpertWizard" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "RaidDeviceSettings" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "LoopCreateWizard" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "LoopEditWizard" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom"], - - "ReallyInstPrepdisk" : $[ `abort : `abort, - `cancel : `cancel, - `finish : "PrepDiskEnd", - `apply : "PrepDiskApply" ], - - "Custom" : $[ `abort : "abort", - `cancel : `cancel, - `raid_wizard : "RaidTypeWizard", - `raid_settings : "RaidDeviceSettings", - `loop_create : "LoopCreateWizard", - `loop_edit : "LoopEditWizard", - `backtoi : `back, - `sysnext : "ReallyInstPrepdisk", - `lvm : "LvmPv", - `lvmlv : "LvmLv", - `zfcp : "S390Zfcp", - `dasd : "S390Dasd", - `evms : "Evms", - `again : "Custom", - `apply : "PrepDiskApply", - `instnext : `next ], - - "LvmPv" : $[ `abort : "abort", - `cancel : `cancel, - `next : "LvmLv" ], - - "LvmLv" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "Evms" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "S390Zfcp" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "S390Dasd" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "PrepDiskApply" : $[ `abort : "ReInitSettings", - `cancel : `cancel, - `back : "ReInitSettings", - `next : "ReInitSettings" ], - - "PrepDiskEnd" : $[ `abort : "ReInitSettings", - `cancel : `cancel, - `back : "ReInitSettings", - `next : `next ], - - "ReInitSettings" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "abort" : $[ `yes : `abort, - `cancel : `cancel] - ]; + if (!Storage::CheckBackupState("disk")) + Storage::CreateTargetBackup("disk"); + boolean handle_dialog = Mode::normal() || Mode::repair(); - if ( handle_dialog ) { - Wizard::CreateDialog(); - Wizard::SetDesktopIcon("disk"); + if (handle_dialog) + { + Wizard::CreateDialog(); + Wizard::SetDesktopIcon("disk"); StorageClients::EnablePopup(); } /*************************************************/ /* Let's do the work ... */ /*************************************************/ - symbol ret = Sequencer::Run(aliases, sequence); - /*************************************************/ - y2milestone( "Sequencer ret=%1 handle_dialog=%2", ret, handle_dialog ); - + symbol ret = (symbol) WFM::CallFunction("inst_custom_part", [true, true]); - if( handle_dialog ) - { + if (handle_dialog) + { UI::CloseDialog(); - } + } else - { + { if( ret == `back || ret == `abort ) - { + { Storage::RestoreTargetBackup("disk"); - } + } else if( ret == `next ) - { + { Storage::DisposeTargetBackup("disk"); Storage::SetPartProposalActive(false); - } } + } - y2milestone("Disk module finished"); - Storage::SaveExitKey( ret ); - return( ret ); + Storage::SaveExitKey(ret); + y2milestone("end inst_disk ret:%1", ret); + return ret; } Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Fri Aug 1 10:57:04 2008 @@ -1039,7 +1039,8 @@ global define string GetName( symbol used_fs, string defaultv )``{ map<symbol,any> fsmap = GetFsMap( used_fs); string ret = fsmap[`name]:""; - if ( ret == "" && used_fs == `ntfs ) ret = "NTFS"; + if ( ret == "" && used_fs == `ntfs ) ret = "NTFS"; // obsolete? (included in RealFileSystems) + if ( ret == "" && used_fs == `nfs ) ret = "NFS"; if ( ret == "" ) ret = defaultv; return ret; } @@ -1452,9 +1453,10 @@ return( fst_default ); } -global map DefaultFormatOptions( map part ) + +global map <any, map <string, any> > DefaultFormatOptions( map part ) { - map ret = $[]; + map <any, map <string, any> > ret = $[]; symbol fsys = part["used_fs"]:`none; if( part["format"]:false ) { Modified: trunk/storage/storage/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Make… ============================================================================== --- trunk/storage/storage/src/modules/Makefile.am (original) +++ trunk/storage/storage/src/modules/Makefile.am Fri Aug 1 10:57:04 2008 @@ -13,7 +13,15 @@ Storage.ycp \ StorageClients.ycp \ StorageControllers.ycp \ - StorageDevices.ycp + StorageDevices.ycp \ + StorageFields.ycp \ + StorageSettings.ycp \ + TreePanel.ycp \ + TabPanel.ycp \ + MiniWorkflow.ycp \ + Greasemonkey.ycp \ + DevicesSelectionBox.ycp \ + DualMultiSelectionBox.ycp EXTRA_DIST = $(module_DATA) Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Fri Aug 1 10:57:04 2008 @@ -16,6 +16,7 @@ import "Mode"; import "Stage"; import "AsciiFile"; + import "String"; // The filesystem ids for the partitions global integer fsid_empty = 0; @@ -97,36 +98,40 @@ ]; -global define void Partitions() - ``{ - return ; - } +global void SetDefaultFs(symbol new_default_fs) +{ + default_fs = new_default_fs; +} -global define symbol DefaultFs() - ``{ - if( default_fs == `unknown ) - { - default_fs = `ext3; - } - return( default_fs ); +global symbol DefaultFs() +{ + if (default_fs == `unknown) + { + string tmp = (string) SCR::Read(.sysconfig.storage.DEFAULT_FS); + if (tmp == nil || !contains([ "ext2", "ext3", "reiserfs" ], tolower(tmp))) + tmp = "ext3"; + + default_fs = symbolof(toterm(tolower(tmp))); } + return default_fs; +} -global define symbol DefaultBootFs() - ``{ - if( default_boot_fs == `unknown ) +global symbol DefaultBootFs() +{ + if (default_boot_fs == `unknown) + { + default_boot_fs = DefaultFs(); + if (Arch::ia64()) { - default_boot_fs = `ext3; - if( Arch::ia64 () ) - { default_boot_fs = `vfat; - } - else if( Arch::board_mac () ) - { + } + else if (Arch::board_mac()) + { default_boot_fs = `hfs; - } } - return( default_boot_fs ); } + return default_boot_fs; +} global define string BootMount() ``{ @@ -284,6 +289,11 @@ return( fsid==fsid_extended || fsid==fsid_extended_win ); } +global define boolean IsSwapPartition( integer fsid ) + ``{ + return( !IsDosWinNtPartition( fsid ) && fsid==fsid_swap ); + } + global define integer SwapSizeMb( integer slot_size ) ``{ integer swap_size = 0; @@ -746,62 +756,4 @@ return( text ); } - /*--------------------------------------------------------------------- - * returns for a string a string with a minimum of 9 characters: - * "1" -> " 1" - * "22" -> " 22" - * "145" -> " 145" - * "2134" -> " 2134" - *---------------------------------------------------------------------- - */ -define string sto8string( string str ) - ``{ - integer nb = size( str ); - if ( nb > 8 ) return( sformat( "%1", str )); - if ( nb > 7 ) return( sformat( " %1", str )); - if ( nb > 6 ) return( sformat( " %1", str )); - if ( nb > 5 ) return( sformat( " %1", str )); - if ( nb > 4 ) return( sformat( " %1", str )); - if ( nb > 3 ) return( sformat( " %1", str )); - if ( nb > 2 ) return( sformat( " %1", str )); - if ( nb > 1 ) return( sformat( " %1", str )); - return( sformat( " %1", str )); - }; - -/*--------------------------------------------------------------------- - * Convert <number-of-bytes> to XXX.X MB or XXX.X GB or XXX.X TB - * - * see also ByteToHumanStringWithZero ! - * Return value: string "unknown" if input == 0 - *---------------------------------------------------------------------- - */ -global define string ByteToHumanString ( integer number ) - ``{ - // column description, if disk space is not known - if( number == 0 ) return( _("unknown") ); - - if( number < 1073741824 ) - { - // < 1 GB - integer MB = number / 1048576; - integer hunKB = (number - (MB * 1048576)) / 104858; - return( sto8string(sformat( "%1.%2 MB", MB,hunKB ))); - } - else if ( number < 1099511627776 ) - { - // < 1 TB - integer GB = number / 1073741824; - integer hunMB = (number - (GB * 1073741824)) / 107374183; - return( sto8string(sformat( "%1.%2 GB", GB,hunMB ))); - } - else - { - // >= 1 TB - integer TB = number / 1099511627776; - integer hunGB = (number - (TB * 1099511627776)) / 109951162778; - return( sto8string(sformat( "%1.%2 TB", TB,hunGB ))); - } - }; - - } Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Fri Aug 1 10:57:04 2008 @@ -65,6 +65,7 @@ import "LibStorage::PartitionAddInfo"; import "LibStorage::DmPartCoInfo"; import "LibStorage::DmraidCoInfo"; + import "LibStorage::PartitionSlotInfo"; map<string,any> conv_ctype = $[ "def_sym" : `CT_UNKNOWN, @@ -315,6 +316,50 @@ } } + +global string ByteToHumanString(integer bytes) +{ + return LibStorage::StorageInterface::byteToHumanString(sint, bytes, false, 2, false); +} + + +global string KByteToHumanString(integer kbytes) +{ + return LibStorage::StorageInterface::byteToHumanString(sint, kbytes * 1024, false, 2, false); +} + + +global string ByteToHumanStringWithPrecision(integer bytes, integer precision, boolean omit_zeroes) +{ + return LibStorage::StorageInterface::byteToHumanString(sint, bytes, false, precision, omit_zeroes); +} + + +global string KByteToHumanStringWithPrecision(integer kbytes, integer precision, boolean omit_zeroes) +{ + return LibStorage::StorageInterface::byteToHumanString(sint, kbytes * 1024, false, precision, omit_zeroes); +} + + +global boolean HumanStringToByte(string str, integer& bytes) +{ + integer i = 0; bytes = i; // bnc #408829 and #408891 + boolean ret = LibStorage::StorageInterface::humanStringToByte(sint, str, false, bytes); + y2milestone("HumanStringToByte ret:%1 str:%2 bytes:%3", ret, str, bytes); + return ret; +} + + +global boolean HumanStringToKByte(string str, integer& kbytes) +{ + integer bytes = 0; // bnc #408829 + boolean ret = LibStorage::StorageInterface::humanStringToByte(sint, str, false, bytes); + kbytes = bytes / 1024; + y2milestone("HumanStringToKByte ret:%1 str:%2 kbytes:%3", ret, str, kbytes); + return ret; +} + + global define map<string,map> GetTargetMap(); /** * @@ -562,6 +607,12 @@ * * @param string device * @return map DiskPartition + * + * Examples: + * "/dev/sda" -> $[ "disk" : "/dev/sda", "nr" : "" ] + * "/dev/sda2" -> $[ "disk" : "/dev/sda", "nr" : 2 ] + * "/dev/system" -> $[ "disk" : "/dev/system", "nr" : "" ] + * "/dev/system/abuild" -> $[ "disk" : "/dev/system", "nr" : "abuild" ] */ global define map GetDiskPartition( string device ) ``{ @@ -885,6 +936,30 @@ return( ret ); }; + +global integer GetUnusedPartitionSlots(string device, list<map> &slots) +{ + list<any> swig_slots = []; + + integer ret = LibStorage::StorageInterface::getUnusedPartitionSlots(sint, device, swig_slots); + + slots = maplist(any swig_slot, swig_slots, { + return $[ + "region" : [ LibStorage::PartitionSlotInfo::swig_cylStart_get(swig_slot), + LibStorage::PartitionSlotInfo::swig_cylSize_get(swig_slot) ], + "primary_slot" : LibStorage::PartitionSlotInfo::swig_primarySlot_get(swig_slot), + "primary_possible" : LibStorage::PartitionSlotInfo::swig_primaryPossible_get(swig_slot), + "extended_slot" : LibStorage::PartitionSlotInfo::swig_extendedSlot_get(swig_slot), + "extended_possible" : LibStorage::PartitionSlotInfo::swig_extendedPossible_get(swig_slot), + "logical_Slot" : LibStorage::PartitionSlotInfo::swig_logicalSlot_get(swig_slot), + "logical_possible" : LibStorage::PartitionSlotInfo::swig_logicalPossible_get(swig_slot) + ]; + }); + + return ret; +} + + /** * Adds ... and returns the changed map * @@ -2412,6 +2487,20 @@ return( ret ); } + +global map<string, any> NextMd() +{ + y2milestone("NextMd"); + integer num = 0; + string dev = ""; + integer r = LibStorage::StorageInterface::nextFreeMd(sint, num, dev); + if( r<0 ) + y2error("NextMd ret %1", r); + map<string, any> ret = $[ "device" : dev, "nr" : num ]; + y2milestone( "NextMd sint ret:%1 map:%2", r, ret ); + return ret; +} + global integer MaxSizeLabelK( map disk ) { integer ret = 0; @@ -2832,6 +2921,18 @@ return( ret==0 ); } +global boolean CreateLvmVgWithDevs( string name, integer pesize, boolean lvm2, list<string> devs ) + { + y2milestone( "CreateLvmVgWithDevs name:%1 pesize:%2 lvm2:%3 devs:%4", name, pesize, lvm2, devs ); + integer ret = 0; + ret = LibStorage::StorageInterface::createLvmVg( sint, name, pesize/1024, + !lvm2, devs ); + if( ret<0 ) + y2error( "CreateLvmVgWithDevs sint ret:%1", ret ); + UpdateTargetMap(); + return( ret==0 ); + } + global boolean ExtendLvmVg( string name, string device ) { y2milestone( "ExtendLvmVg name:%1 device:%2", name, device ); @@ -3100,6 +3201,25 @@ return( ret==0 ); } +global boolean CreateMdWithDevs(integer nr, symbol type, list<string> devices) +{ + y2milestone( "CreateMdWithDevs nr:%1 type:%2 devices:%3", nr, type, devices ); + integer ret = 0; + + integer tmp = LibStorage::RAID_UNK(); + foreach(integer k, symbol v, conv_mdtype["m"]:$[], { + if (v == type) + tmp = k; + }); + + string rd = sformat("/dev/md%1", nr ); + ret = LibStorage::StorageInterface::createMd(sint, rd, tmp, devices); + if( ret<0 ) + y2error( "CreateMdWithDevs sint ret:%1", ret ); + UpdateTargetMap(); + return ret==0; +} + global boolean ExtendMd( integer nr, string dev ) { y2milestone( "ExtendMd nr:%1 dev:%2", nr, dev ); @@ -3150,6 +3270,19 @@ return( ret==0 ); } +global boolean ChangeMdParitySymbol( integer nr, symbol ptype ) +{ + y2milestone( "ChangeMdParitySymbol nr:%1 parity:%2", nr, ptype ); + integer ret = 0; + string rd = sformat("/dev/md%1", nr ); + integer tmp = fromSymbol(conv_mdparity, ptype); + ret = LibStorage::StorageInterface::changeMdParity(sint, rd, tmp); + if( ret<0 ) + y2error( "ChangeMdParitySymbol sint ret:%1", ret ); + UpdateTargetMapDev( rd ); + return( ret==0 ); +} + global boolean ChangeMdChunk( integer nr, integer chunk ) { y2milestone( "ChangeMdChunk nr:%1 chunk:%2", nr, chunk ); @@ -3173,6 +3306,22 @@ return( ret ); } +global integer ComputeMdSize(symbol md_type, list<string> devices, integer& sizeK) +{ + integer ret = 0; + + integer tmp = LibStorage::RAID_UNK(); + foreach(integer k, symbol v, conv_mdtype["m"]:$[], { + if (v == md_type) + tmp = k; + }); + + ret = LibStorage::StorageInterface::computeMdSize(sint, tmp, devices, sizeK); + if( ret!=0 ) + y2milestone( "ComputeMdSize sint ret:%1", ret ); + return ret; +} + global string CreateLoop( string file, boolean create, integer sizeK, string mp ) { @@ -3285,6 +3434,16 @@ return( ret==0 ); } + +global string DefaultDiskLabel(integer size_k) +{ + y2milestone("DefaultDiskLabel size_k:%1", size_k ); + string label = LibStorage::StorageInterface::defaultDiskLabelSize(sint, size_k); + y2milestone("DefaultDiskLabel label:%1", label); + return label; +} + + /** * Delete the partition table and disk label of device * @param string the disk to deleted the partition table from @@ -3305,6 +3464,18 @@ return( ret==0 ); } + +global boolean CreatePartitionTable(string disk, string label) +{ + y2milestone("CreatePartitionTable %1 label:%2", disk, label); + integer ret = LibStorage::StorageInterface::destroyPartitionTable(sint, disk, label); + if (ret < 0) + y2error("CreatePartitionTable sint ret:%1", ret); + UpdateTargetMap(); + return ret == 0; +} + + global symbol GetMountBy( string device ); /** @@ -3616,7 +3787,7 @@ disk = getDiskInfo( dev, disk ); integer s = disk["size_k"]:0 * 1024; disk["name"] = disk["dname"]:"" + - Partitions::ByteToHumanString( s ) + ", " + + Storage::ByteToHumanString( s ) + ", " + disk["device"]:"" + ", "; if( size( disk["vendor"]:"")>0 ) disk["name"] = disk["name"]:"" + disk["vendor"]:"" + "-"; @@ -6939,6 +7110,22 @@ } } + +global void SetDefaultMountBy(symbol mby) +{ + integer val = fromSymbol( conv_mountby, mby ); + LibStorage::StorageInterface::setDefaultMountBy(sint, val); +} + + +global symbol GetDefaultMountBy() +{ + integer val = LibStorage::StorageInterface::getDefaultMountBy(sint); + symbol ret = toSymbol(conv_mountby, val); + return ret; +} + + global symbol GetMountBy( string device ) { integer val = 0; Modified: trunk/storage/storage/src/storage_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/storage_fini… ============================================================================== --- trunk/storage/storage/src/storage_finish.ycp (original) +++ trunk/storage/storage/src/storage_finish.ycp Fri Aug 1 10:57:04 2008 @@ -17,6 +17,7 @@ textdomain "storage"; import "Storage"; +import "StorageSettings"; import "Mode"; import "Installation"; import "Initrd"; @@ -76,6 +77,7 @@ SCR::Execute (.target.bash, "/sbin/vgscan"); } Storage::SaveUsedFs(); + StorageSettings::Save(); } else { Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Fri Aug 1 10:57:04 2008 @@ -4,10 +4,9 @@ @HEADER@ BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite yast2-perl-bindings Requires: parted yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid kpartx cryptsetup -# proc_meminfo.scr moved to yast2-2.15.23 -# Installation::installedVersion and Installation::updateVersion -# AutionstData -Requires: yast2 >= 2.16.8 +Requires: yast2-core >= 2.17.1 +Requires: yast2 >= 2.17.3 +Requires: yast2-libyui >= 2.17.5 %ifarch s390 s390x Requires: yast2-s390 %endif @@ -81,7 +80,6 @@ # disk %dir @desktopdir@ @desktopdir@/disk.desktop -@desktopdir@/lvm_config.desktop # scripts @ybindir@/check.boot -- 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] r49561 - /tags/stable-2_17_0/dhcp-server/
by juhliarik＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: juhliarik Date: Fri Aug 1 10:40:09 2008 New Revision: 49561 URL: http://svn.opensuse.org/viewcvs/yast?rev=49561&view=rev Log: Created tag stable-2_17_0 for dhcp-server Added: tags/stable-2_17_0/dhcp-server/ - copied from r49560, trunk/dhcp-server/ -- 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] r49560 - /branches/tmp/coolo/update_yast_repo/last_rev_zypp
by mlandres＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: mlandres Date: Fri Aug 1 10:38:04 2008 New Revision: 49560 URL: http://svn.opensuse.org/viewcvs/yast?rev=49560&view=rev Log: updated Modified: branches/tmp/coolo/update_yast_repo/last_rev_zypp Modified: branches/tmp/coolo/update_yast_repo/last_rev_zypp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_zypp (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_zypp Fri Aug 1 10:38:04 2008 @@ -1 +1 @@ -10671 +10717 -- 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] r49559 - in /trunk/dhcp-server: VERSION package/yast2-dhcp-server.changes
by juhliarik＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: juhliarik Date: Fri Aug 1 10:27:28 2008 New Revision: 49559 URL: http://svn.opensuse.org/viewcvs/yast?rev=49559&view=rev Log: new version 2.17.0 Modified: trunk/dhcp-server/VERSION trunk/dhcp-server/package/yast2-dhcp-server.changes Modified: trunk/dhcp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/VERSION?rev=49559&r1… ============================================================================== --- trunk/dhcp-server/VERSION (original) +++ trunk/dhcp-server/VERSION Fri Aug 1 10:27:28 2008 @@ -1 +1 @@ -2.16.7 +2.17.0 Modified: trunk/dhcp-server/package/yast2-dhcp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/package/yast2-dhcp-s… ============================================================================== --- trunk/dhcp-server/package/yast2-dhcp-server.changes (original) +++ trunk/dhcp-server/package/yast2-dhcp-server.changes Fri Aug 1 10:27:28 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 1 10:24:10 CEST 2008 - juhliarik(a)suse.cz + +- update dhcp-server depend on LDAP changes +- 2.17.0 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz - added categories Settings and System into desktop file -- 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] r49558 - /trunk/dhcp-server/src/DhcpServer.pm
by juhliarik＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: juhliarik Date: Fri Aug 1 10:22:49 2008 New Revision: 49558 URL: http://svn.opensuse.org/viewcvs/yast?rev=49558&view=rev Log: update dhcp-server depend on LDAP changes Modified: trunk/dhcp-server/src/DhcpServer.pm Modified: trunk/dhcp-server/src/DhcpServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/DhcpServer.pm?re… ============================================================================== --- trunk/dhcp-server/src/DhcpServer.pm (original) +++ trunk/dhcp-server/src/DhcpServer.pm Fri Aug 1 10:22:49 2008 @@ -391,12 +391,12 @@ my %record = %{ $found[0] || {}}; # determine type - my @classes = @{ $record { "objectclass" } || [] }; + my @classes = @{ $record { "objectClass" } || [] }; - if ( grep ( /dhcpOptions/, @classes ) && defined $record { "dhcpoption" } ) + if ( grep ( /dhcpOptions/, @classes ) && defined $record { "dhcpOption" } ) { # there are some options to gather - my @opts = @{ $record { "dhcpoption" } }; + my @opts = @{ $record { "dhcpOption" } }; foreach my $opt (@opts) { # split by spaces my @single = split (/ +/, $opt); @@ -417,9 +417,9 @@ } } - if ( defined $record { "dhcpstatements" } ) + if ( defined $record { "dhcpStatements" } ) { - my @statements = @{ $record { "dhcpstatements" } }; + my @statements = @{ $record { "dhcpStatements" } }; # there are some directives to gather foreach my $stmt (@statements) { # split by spaces @@ -442,22 +442,22 @@ } # now handle also special case statements - if ( $type eq "host" && defined $record { "dhcphwaddress" } ) + if ( $type eq "host" && defined $record { "dhcpHWAddress" } ) { my %directive_rec = ( "key" => "hardware", - "value" => $record { "dhcphwaddress" }->[0], + "value" => $record { "dhcpHWAddress" }->[0], "type" => "directive", "comment_before" => "", "comment_after" => "" ); push @directives, \%directive_rec; } - elsif ( ($type eq "pool" || $type eq "subnet" ) && defined $record { "dhcprange" } ) + elsif ( ($type eq "pool" || $type eq "subnet" ) && defined $record { "dhcpRange" } ) { my %directive_rec = ( "key" => "range", - "value" => $record { "dhcprange" }->[0], + "value" => $record { "dhcpRange" }->[0], "type" => "directive", "comment_before" => "", "comment_after" => "" @@ -497,7 +497,7 @@ my $r_type = undef; # determine type - my @classes = @{ $child_record { "objectclass" } }; + my @classes = @{ $child_record { "objectClass" } }; if ( grep ( /dhcpPool/, @classes ) ) { @@ -533,7 +533,7 @@ if ($r_type eq "subnet") { - my @netmasks = @{ $child_record { "dhcpnetmask" } }; + my @netmasks = @{ $child_record { "dhcpNetMask" } }; my $netmask = $netmasks[0]; $netmask = Netmask->FromBits ($netmask); $r_id = "$r_id netmask $netmask"; @@ -650,12 +650,12 @@ @lval = grep { $_ ne ''; } @lval; $val = join (" ", @lval); $val = lc ($val); - $to_save { "dhcphwaddress" } = $val; + $to_save { "dhcpHWAddress" } = $val; } elsif ( ($record { "type" } eq "pool" || $record { "type" } eq "subnet" ) && $r { "key" } eq "range" ) { - $to_save { "dhcprange" } = $r { "value" }; + $to_save { "dhcpRange" } = $r { "value" }; } else { @@ -668,8 +668,8 @@ } } - $to_save { "dhcpoption" } = \@options; - $to_save { "dhcpstatements" } = \@directives; + $to_save { "dhcpOption" } = \@options; + $to_save { "dhcpStatements" } = \@directives; # now, add the type-specific options (required attributes) if ( $record {"type"} eq "subnet" ) @@ -678,9 +678,9 @@ $record { "id" } =~ m/^\s*(\S+)\s+netmask\s+([^ \t]+)[ \t]*$/; my $id = $1; my $netmask = $2; - $to_save { "dhcpnetmask" } = \@{ [ Netmask->ToBits ( $netmask ) ] }; + $to_save { "dhcpNetMask" } = \@{ [ Netmask->ToBits ( $netmask ) ] }; - $to_save { "objectclass" } = \@{ [ "dhcpSubNet", "dhcpOptions", "top" ] }; + $to_save { "objectClass" } = \@{ [ "dhcpSubNet", "dhcpOptions", "top" ] }; $to_save { "cn" } = \@{ [ $id ] }; } elsif ( $record {"type"} eq "pool" ) @@ -688,7 +688,7 @@ $record { "id" } =~ m/^\s*(\S+)\s*$/; my $id = $1; - $to_save { "objectclass" } = \@{ [ "dhcpPool", "dhcpOptions", "top" ] }; + $to_save { "objectClass" } = \@{ [ "dhcpPool", "dhcpOptions", "top" ] }; $to_save { "cn" } = \@{ [ $id ] }; } elsif ( $record {"type"} eq "class" ) @@ -696,7 +696,7 @@ $record { "id" } =~ m/^\s*(\S+)\s*$/; my $id = $1; - $to_save { "objectclass" } = \@{ [ "dhcpClass", "dhcpOptions", "top" ] }; + $to_save { "objectClass" } = \@{ [ "dhcpClass", "dhcpOptions", "top" ] }; $to_save { "cn" } = \@{ [ $id ] }; } elsif ( $record {"type"} eq "host" ) @@ -704,7 +704,7 @@ $record { "id" } =~ m/^\s*(\S+)\s*$/; my $id = $1; - $to_save { "objectclass" } = \@{ [ "dhcpHost", "dhcpOptions", "top" ] }; + $to_save { "objectClass" } = \@{ [ "dhcpHost", "dhcpOptions", "top" ] }; $to_save { "cn" } = \@{ [ $id ] }; } elsif ( $record {"type"} eq "sharednetwork" ) @@ -712,7 +712,7 @@ $record { "id" } =~ m/^\s*(\S+)\s*$/; my $id = $1; - $to_save { "objectclass" } = \@{ [ "dhcpSharedNetwork", "dhcpOptions", "top" ] }; + $to_save { "objectClass" } = \@{ [ "dhcpSharedNetwork", "dhcpOptions", "top" ] }; $to_save { "cn" } = \@{ [ $id ] }; } elsif ( $record {"type"} eq "group" ) @@ -720,7 +720,7 @@ $record { "id" } =~ m/^\s*(\S+)\s*$/; my $id = $1; - $to_save { "objectclass" } = \@{ [ "dhcpGroup", "dhcpOptions", "top" ] }; + $to_save { "objectClass" } = \@{ [ "dhcpGroup", "dhcpOptions", "top" ] }; $to_save { "cn" } = \@{ [ $id ] }; } elsif ( $record {"type"} eq "") @@ -728,8 +728,8 @@ $where_rec{"dn"} =~ m/cn=([^,]+),.*/; my $root_cn = $1; $to_save{"cn"} = $root_cn if (defined ($root_cn)); - $to_save{"objectclass"} = [ "dhcpService", "dhcpOptions", "top"]; - $to_save{"dhcpprimarydn"} = $dhcp_server_dn; + $to_save{"objectClass"} = [ "dhcpService", "dhcpOptions", "top"]; + $to_save{"dhcpPrimaryDN"} = $dhcp_server_dn; } if ( $record {"type"} ne "" ) @@ -2482,7 +2482,7 @@ $dhcp_conf_dn = $keys[0]; %found = %{$found{$dhcp_conf_dn}}; # check if base DN for dhcp config is defined - my @bases = @{ $found{"susedefaultbase"} || [] }; + my @bases = @{ $found{"suseDefaultBase"} || [] }; if (@bases > 0) { $base_config_dn = $bases[0]; @@ -2530,12 +2530,12 @@ y2milestone ("Choosing server $dhcp_server_dn"); y2milestone ("Using LDAP server $dhcp_server_dn"); my %server_entry = %{ $servers{$dhcp_server_dn} }; - if (scalar (@{$server_entry{"dhcpservicedn"}}) > 1) + if (scalar (@{$server_entry{"dhcpServiceDN"}}) > 1) { # error report Report->Error (__("Support for multiple dhcpServiceDN not implemented.")); } - $ldap_dhcp_config_dn = $server_entry{"dhcpservicedn"}[0]; + $ldap_dhcp_config_dn = $server_entry{"dhcpServiceDN"}[0]; if (!(defined ($ldap_dhcp_config_dn) && $ldap_dhcp_config_dn =~ /\S+/)) { # error report @@ -2569,7 +2569,7 @@ } else { - my $pri_dn = $found[0]{"dhcpprimarydn"}[0] || ""; + my $pri_dn = $found[0]{"dhcpPrimaryDN"}[0] || ""; y2milestone ("Primary DN: $pri_dn"); if ($dhcp_server_dn ne $pri_dn) { @@ -2678,7 +2678,7 @@ my %ldap_object = ( 'objectclass' => [ 'top', 'suseDhcpConfiguration' ], 'cn' => [ 'defaultDHCP' ], - 'susedefaultbase' => [ $base_config_dn ], + 'suseDefaultBase' => [ $base_config_dn ], ); my %ldap_request = ( "dn" => $dhcp_conf_dn @@ -2707,11 +2707,11 @@ } # check if base DN for dhcp config is defined - my @bases = @{ $found{"susedefaultbase"} || [] }; + my @bases = @{ $found{"suseDefaultBase"} || [] }; if (@bases == 0) { my %ldap_object = %found; - $ldap_object{"susedefaultbase"} = [$base_config_dn]; + $ldap_object{"suseDefaultBase"} = [$base_config_dn]; my %ldap_request = ( "dn" => "$dhcp_conf_dn", ); @@ -2742,7 +2742,7 @@ if (@dhcps == 0) { my %ldap_object = ( - "objectclass" => [ "top", "organizationalUnit" ], + "objectClass" => [ "top", "organizationalUnit" ], "ou" => [ "DHCP" ], ); my %ldap_request = ( @@ -2779,8 +2779,8 @@ y2milestone ("DHCP server not found in LDAP, creating ". $dhcp_server_dn); my %server_entry = ( - "objectclass" => [ "top", "dhcpServer", "dhcpOptions" ], - "dhcpservicedn" => [ $ldap_dhcp_config_dn ], + "objectClass" => [ "top", "dhcpServer", "dhcpOptions" ], + "dhcpServiceDN" => [ $ldap_dhcp_config_dn ], "cn" => [ $dhcp_server ], ); my %ldap_request = ( @@ -2815,9 +2815,9 @@ my @cn = split(/=/, shift (@ldap_config_dn_elements)); my $cn = $cn[1]; my %ldap_object = ( - "objectclass" => [ "top", "dhcpService", "dhcpOptions" ], + "objectClass" => [ "top", "dhcpService", "dhcpOptions" ], "cn" => [ $cn ], - "dhcpprimarydn" => [ "$dhcp_server_dn" ], + "dhcpPrimaryDN" => [ "$dhcp_server_dn" ], ); my %ldap_request = ( "dn" => "$ldap_dhcp_config_dn", -- 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] r49557 - in /trunk/heartbeat: .cvsignore agents/.cvsignore doc/.cvsignore doc/autodocs/.cvsignore package/.cvsignore src/.cvsignore testsuite/.cvsignore testsuite/tests/.cvsignore
by coolo＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: coolo Date: Fri Aug 1 09:42:12 2008 New Revision: 49557 URL: http://svn.opensuse.org/viewcvs/yast?rev=49557&view=rev Log: ignoring ignores Removed: trunk/heartbeat/.cvsignore trunk/heartbeat/agents/.cvsignore trunk/heartbeat/doc/.cvsignore trunk/heartbeat/doc/autodocs/.cvsignore trunk/heartbeat/package/.cvsignore trunk/heartbeat/src/.cvsignore trunk/heartbeat/testsuite/.cvsignore trunk/heartbeat/testsuite/tests/.cvsignore -- 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] r49556 - in /trunk/build-test: yast2-build-test.changes yast2-build-test.spec
by coolo＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: coolo Date: Fri Aug 1 09:40:13 2008 New Revision: 49556 URL: http://svn.opensuse.org/viewcvs/yast?rev=49556&view=rev Log: sync with autobuild Modified: trunk/build-test/yast2-build-test.changes trunk/build-test/yast2-build-test.spec Modified: trunk/build-test/yast2-build-test.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/build-test/yast2-build-test.chan… ============================================================================== --- trunk/build-test/yast2-build-test.changes (original) +++ trunk/build-test/yast2-build-test.changes Fri Aug 1 09:40:13 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 31 12:30:35 CEST 2008 - ro(a)suse.de + +- remove dropped packages from buildreq: + yast2-cim, yast2-storage-evms + +------------------------------------------------------------------- Sat Mar 29 08:16:36 CET 2008 - coolo(a)suse.de - fix build Modified: trunk/build-test/yast2-build-test.spec URL: http://svn.opensuse.org/viewcvs/yast/trunk/build-test/yast2-build-test.spec… ============================================================================== --- trunk/build-test/yast2-build-test.spec (original) +++ trunk/build-test/yast2-build-test.spec Fri Aug 1 09:40:13 2008 @@ -10,13 +10,14 @@ # norootforbuild + Name: yast2-build-test Version: 2.13.2 -Release: 228 +Release: 290 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dosfstools gcc-c++ limal-ca-mgm-perl limal-devel limal-devtools perl-Archive-Zip perl-Compress-Zlib perl-Crypt-SmbHash perl-Date-Calc perl-Digest-HMAC perl-NetxAP perl-URI perl-X500-DN yast2-add-on yast2-add-on-creator yast2-apparmor yast2-backup yast2-bootloader yast2-ca-management yast2-cim yast2-control-center yast2-core-devel yast2-country yast2-devel-doc yast2-devtools yast2-dhcp-server yast2-dns-server yast2-fingerprint-reader yast2-firewall yast2-firstboot yast2-ftp-server yast2-hardware-detection yast2-heartbeat yast2-http-server yast2-inetd yast2-installation yast2-instserver yast2-irda yast2-iscsi-client yast2-iscsi-server yast2-kdump yast2-kerberos-client yast2-ldap yast2-ldap-client yast2-ldap-server yast2-live-installer yast2-mail yast2-mail-server yast2-metapackage-handler yast2-mouse yast2-ncurses yast2-network yast2-nfs-client yast2-nfs-server yast2-nis-client yast2-nis-server yast2-ntp-client yast2-online-update yast2-packagemanager-devel yast2-packager yast2-pam yast2-perl-bindings yast2-pkg-bindings yast2-printer yast2-product-creator yast2-profile-manager yast2-qt yast2-repair yast2-restore yast2-runlevel yast2-samba-client yast2-samba-server yast2-scanner yast2-schema yast2-security yast2-slide-show-SLES yast2-slide-show-SuSELinux yast2-slp yast2-slp-server yast2-storage yast2-storage-devel yast2-storage-evms yast2-storage-lib yast2-support yast2-sysconfig yast2-testsuite yast2-tftp-server yast2-theme-NLD yast2-theme-openSUSE yast2-trans-bg yast2-trans-bn yast2-trans-bs yast2-trans-cs yast2-trans-cy yast2-trans-da yast2-trans-de yast2-trans-el yast2-trans-en_GB yast2-trans-en_US yast2-trans-es yast2-trans-fi yast2-trans-fr yast2-trans-he yast2-trans-hu yast2-trans-it yast2-trans-ja yast2-trans-km yast2-trans-ko yast2-trans-lt yast2-trans-nb yast2-trans-nl yast2-trans-pa yast2-trans-pl yast2-trans-pt yast2-trans-pt_BR yast2-trans-ro yast2-trans-ru yast2-trans-sk yast2-trans-sl yast2-trans-sr yast2-trans-stats yast2-trans-sv yast2-trans-tr yast2-trans-uk yast2-trans-zh_CN yast2-trans-zh_TW yast2-transfer yast2-tune yast2-update yast2-users yast2-xml yast2-registration +BuildRequires: dosfstools gcc-c++ limal-ca-mgm-perl limal-devel limal-devtools perl-Archive-Zip perl-Compress-Zlib perl-Crypt-SmbHash perl-Date-Calc perl-Digest-HMAC perl-NetxAP perl-URI perl-X500-DN yast2-add-on yast2-add-on-creator yast2-apparmor yast2-backup yast2-bootloader yast2-ca-management yast2-control-center yast2-core-devel yast2-country yast2-devel-doc yast2-devtools yast2-dhcp-server yast2-dns-server yast2-fingerprint-reader yast2-firewall yast2-firstboot yast2-ftp-server yast2-hardware-detection yast2-heartbeat yast2-http-server yast2-inetd yast2-installation yast2-instserver yast2-irda yast2-iscsi-client yast2-iscsi-server yast2-kdump yast2-kerberos-client yast2-ldap yast2-ldap-client yast2-ldap-server yast2-live-installer yast2-mail yast2-mail-server yast2-metapackage-handler yast2-mouse yast2-ncurses yast2-network yast2-nfs-client yast2-nfs-server yast2-nis-client yast2-nis-server yast2-ntp-client yast2-online-update yast2-packagemanager-devel yast2-packager yast2-pam yast2-perl-bindings yast2-pkg-bindings yast2-printer yast2-product-creator yast2-profile-manager yast2-qt yast2-registration yast2-repair yast2-restore yast2-runlevel yast2-samba-client yast2-samba-server yast2-scanner yast2-schema yast2-security yast2-slide-show-SLES yast2-slide-show-SuSELinux yast2-slp yast2-slp-server yast2-storage yast2-storage-devel yast2-storage-lib yast2-support yast2-sysconfig yast2-testsuite yast2-tftp-server yast2-theme-NLD yast2-theme-openSUSE yast2-trans-bg yast2-trans-bn yast2-trans-bs yast2-trans-cs yast2-trans-cy yast2-trans-da yast2-trans-de yast2-trans-el yast2-trans-en_GB yast2-trans-en_US yast2-trans-es yast2-trans-fi yast2-trans-fr yast2-trans-he yast2-trans-hu yast2-trans-it yast2-trans-ja yast2-trans-km yast2-trans-ko yast2-trans-lt yast2-trans-nb yast2-trans-nl yast2-trans-pa yast2-trans-pl yast2-trans-pt yast2-trans-pt_BR yast2-trans-ro yast2-trans-ru yast2-trans-sk yast2-trans-sl yast2-trans-sr yast2-trans-stats yast2-trans-sv yast2-trans-tr yast2-trans-uk yast2-trans-zh_CN yast2-trans-zh_TW yast2-transfer yast2-tune yast2-update yast2-users yast2-xml %ifnarch s390 s390x BuildRequires: sax2-libsax-perl yast2-boot-server yast2-phone-services yast2-sound yast2-tv yast2-x11 %endif @@ -77,6 +78,11 @@ %doc README %changelog +* Thu Jul 31 2008 ro(a)suse.de +- remove dropped packages from buildreq: + yast2-cim, yast2-storage-evms +* Sat Mar 29 2008 coolo(a)suse.de +- fix build * Mon Jan 21 2008 ro(a)suse.de - use buildignore for tomcat as in yast2-schema * Thu Dec 20 2007 ro(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] r49555 - /trunk/gtk/TODO
by rpmcruz＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: rpmcruz Date: Fri Aug 1 02:28:34 2008 New Revision: 49555 URL: http://svn.opensuse.org/viewcvs/yast?rev=49555&view=rev Log: Updating TODO. Modified: trunk/gtk/TODO Modified: trunk/gtk/TODO URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/TODO?rev=49555&r1=49554&r2=4… ============================================================================== --- trunk/gtk/TODO (original) +++ trunk/gtk/TODO Fri Aug 1 02:28:34 2008 @@ -7,19 +7,9 @@ = Look and feel = -* YGtkWizard: navigation bar (see sysconfig module) should be GtkPaned. - -* YGtkWizard: support for skin -- some mockups under mockups/. - -* YGBarGraph / RatioBox: let tiny widgets still have some pixels visible - for popup menu. - * YGRichText: should use GtkHtml when available, so that we get support for tables. -* RatioBox: Our buttons are too big in some dialogs (eg. run disk.ycp as user). - Check where our algorithm differs from yast-core's. - * YGTextEntry / YGMultiLineEdit: Add undo/redo support. The backend code should be shared. We probably want to make an interface for it that is then implemented by those two GTK widgets. Work out a patch for GTK+. @@ -27,40 +17,17 @@ = Package Selector = (this little monster diserves a section of its own. =)) -* Patch selector (YOU) - + we should also list installed patches and maybe a way to remove them - (downgrade of version should work for most cases -- check how qt does it). - Probably a tab for this? - -* Translation support (i18n -- pot files -- gettext!). - * Search syntax: add proper Google syntax support. Consider also adding regex support when Glib ships with it (add radio boxes to entry's context menu). -* Re-work Yast face to Jakub's suggestion; make it configurable. - -* We need an easter-egg! :) - -= Internal affairs = - -* IntField / Slider - o to consider: only report value change when the widget is stalled. - To use g_idle functionality. - = Yast-Core = -* Stock images for wizard - Already patched stock icons supports for regular button (even if not - currently being used), but not for wizard ones. +* Stock icons for buttons (at least the wizard ones) + Currently the support is limited to English because it's done by comparing + the strings to a list of stock icon ones. * Button order Should be possible to specify button order. eg: [Ok] [Cancel] vs [Cancel] [Ok] We could hack this through if we had stock images support (may depend on the way they are implemented). - -** Performance of yast2 package selector: - + 95% of the time is spent in zypper, - + the filter models (etc.) are doing a fairly good job - + unfortunately fetching 'summary' and 'description' is painfully slow - + accelerated summary with a hash/cache. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0