May 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64181 - in /branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src: Btrfs.cc Volume.cc Volume.h
by fehr＠svn2.opensuse.org 31 May '11

31 May '11

Author: fehr Date: Tue May 31 19:36:37 2011 New Revision: 64181 URL: http://svn.opensuse.org/viewcvs/yast?rev=64181&view=rev Log: remove tmpdir after umount Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.h Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc Tue May 31 19:36:37 2011 @@ -285,7 +285,7 @@ ++d; } if( needUmount ) - ret = umountTmpMount( ret ); + ret = umountTmpMount( m, ret ); y2mil( "this:" << *this ); y2mil("ret:" << ret); return( ret ); @@ -316,7 +316,7 @@ ++d; } if( needUmount ) - ret = umountTmpMount( ret ); + ret = umountTmpMount( m, ret ); y2mil( "this:" << *this ); y2mil("ret:" << ret); return( ret ); @@ -346,7 +346,7 @@ } } if( needUmount ) - ret = umountTmpMount( ret ); + ret = umountTmpMount( m, ret ); y2mil( "ret:" << ret ); return( ret ); } @@ -384,7 +384,7 @@ } } if( needUmount ) - ret = umountTmpMount( ret ); + ret = umountTmpMount( m, ret ); y2mil( "ret:" << ret ); return( ret ); } Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc Tue May 31 19:36:37 2011 @@ -723,11 +723,13 @@ return( ret ); } -int Volume::umountTmpMount( int ret ) +int Volume::umountTmpMount( const string& m, int ret ) { int r = ret; if( !getStorage()->umountDev( mountDevice() ) && r==0 ) r = VOLUME_CANNOT_TMP_UMOUNT; + if( m.substr( 0, 16 )== "/tmp/libstorage-" ) + rmdir( m.c_str() ); return( r ); } @@ -853,7 +855,7 @@ } } if( needUmount ) - ret = umountTmpMount( ret ); + ret = umountTmpMount( m, ret ); } } y2mil( "ret:" << ret ); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.h Tue May 31 19:36:37 2011 @@ -235,7 +235,7 @@ bool format ) const; bool noFreqPassno() const; int prepareTmpMount( string& m, bool& needUmount ); - int umountTmpMount( int ret ); + int umountTmpMount( const string& m, int ret ); int doFormatBtrfs(); string getLosetupCmd( storage::EncryptType, const string& pwdfile ) const; -- 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] r64180 - in /branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src: Storage.cc Volume.cc
by fehr＠svn2.opensuse.org 31 May '11

31 May '11

Author: fehr Date: Tue May 31 18:03:13 2011 New Revision: 64180 URL: http://svn.opensuse.org/viewcvs/yast?rev=64180&view=rev Log: fix bug in handlig rootprefix when creating subvolumes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc Tue May 31 18:03:13 2011 @@ -1146,10 +1146,10 @@ string Storage::prependRoot(const string& mp) const { - if (mp == "swap") + if (mp == "swap" || rootprefix.empty() ) return mp; - if (rootprefix != "" && mp == "/") + if (mp == "/") return rootprefix; else return rootprefix + mp; Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc Tue May 31 18:03:13 2011 @@ -711,7 +711,7 @@ { int ret = 0; needUmount=false; - m = getMount(); + m = getStorage()->prependRoot(getMount()); if( !isMounted() ) { if( getStorage()->mountTmp( this, m ) ) -- 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] r64179 - in /branches/SuSE-Code-11-SP2-Branch/ca-management/src: ca_mgm_auto.ycp ca_select_proposal.ycp new_cert.ycp
by jreidinger＠svn2.opensuse.org 31 May '11

31 May '11

Author: jreidinger Date: Tue May 31 17:41:22 2011 New Revision: 64179 URL: http://svn.opensuse.org/viewcvs/yast?rev=64179&view=rev Log: create country selection combobox editable to allow choose of countries not specifically listed (FATE#310179) Modified: branches/SuSE-Code-11-SP2-Branch/ca-management/src/ca_mgm_auto.ycp branches/SuSE-Code-11-SP2-Branch/ca-management/src/ca_select_proposal.ycp branches/SuSE-Code-11-SP2-Branch/ca-management/src/new_cert.ycp Modified: branches/SuSE-Code-11-SP2-Branch/ca-management/src/ca_mgm_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ca-ma… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ca-management/src/ca_mgm_auto.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ca-management/src/ca_mgm_auto.ycp Tue May 31 17:41:22 2011 @@ -116,7 +116,7 @@ `HBox(`HWeight (1,`TextEntry(`id(`email), _("E-Mail"), CaMgm::autoYaSTSettings["server_email"]:"")), `HSpacing(2), - `HWeight (1,`ComboBox( `id (`id_country), _("C&ountry:"), + `HWeight (1,`ComboBox( `id (`id_country), `opt(`editable), _("C&ountry:"), getAutoCountryList())) ), `HBox(`HWeight (1,`TextEntry( `id (`id_organisation), _("O&rganization:"), Modified: branches/SuSE-Code-11-SP2-Branch/ca-management/src/ca_select_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ca-ma… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ca-management/src/ca_select_proposal.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ca-management/src/ca_select_proposal.ycp Tue May 31 17:41:22 2011 @@ -77,7 +77,7 @@ `HBox(`HWeight (1,`TextEntry( `id (`id_serverName), _("&Server Name:"), CaMgm::prop_server_commonName )), `HSpacing(2), - `HWeight (1,`ComboBox( `id (`id_country), _("C&ountry:"), + `HWeight (1,`ComboBox( `id (`id_country), `opt(`editable), _("C&ountry:"), getPropCountryList())) ), `HBox(`HWeight (1,`TextEntry( `id (`id_organisation), _("O&rganization:"), Modified: branches/SuSE-Code-11-SP2-Branch/ca-management/src/new_cert.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ca-ma… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ca-management/src/new_cert.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ca-management/src/new_cert.ycp Tue May 31 17:41:22 2011 @@ -149,7 +149,7 @@ `HSpacing(2), `HWeight (1,`TextEntry(`id (`id_state), _("&State:"), CaMgm::state )))); - contents = add (contents, `HBox (`HWeight(1,`ComboBox( `id (`id_country), _("C&ountry:"), getCountryList())))); + contents = add (contents, `HBox (`HWeight(1,`ComboBox( `id (`id_country), `opt(`editable), _("C&ountry:"), getCountryList())))); // To translators: dialog label -- 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] r64178 - /branches/SuSE-Code-11-SP2-Branch/ca-management/
by jreidinger＠svn2.opensuse.org 31 May '11

31 May '11

Author: jreidinger Date: Tue May 31 17:30:07 2011 New Revision: 64178 URL: http://svn.opensuse.org/viewcvs/yast?rev=64178&view=rev Log: add ca management to implement SP2 features Added: branches/SuSE-Code-11-SP2-Branch/ca-management/ (props changed) - copied from r64177, branches/SuSE-Code-11-SP1-Branch/ca-management/ -- 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] r64177 - in /trunk/dbus-client: VERSION agent-dbus/src/DbusAgent.cc package/yast2-dbus-client.changes
by aschnell＠svn2.opensuse.org 31 May '11

31 May '11

Author: aschnell Date: Tue May 31 16:06:38 2011 New Revision: 64177 URL: http://svn.opensuse.org/viewcvs/yast?rev=64177&view=rev Log: - fixed passing bool to dbus library Modified: trunk/dbus-client/VERSION trunk/dbus-client/agent-dbus/src/DbusAgent.cc trunk/dbus-client/package/yast2-dbus-client.changes Modified: trunk/dbus-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/dbus-client/VERSION?rev=64177&r1… ============================================================================== --- trunk/dbus-client/VERSION (original) +++ trunk/dbus-client/VERSION Tue May 31 16:06:38 2011 @@ -1 +1 @@ -2.18.0 +2.21.0 Modified: trunk/dbus-client/agent-dbus/src/DbusAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/dbus-client/agent-dbus/src/DbusA… ============================================================================== --- trunk/dbus-client/agent-dbus/src/DbusAgent.cc (original) +++ trunk/dbus-client/agent-dbus/src/DbusAgent.cc Tue May 31 16:06:38 2011 @@ -135,7 +135,7 @@ if (tmp3->isString()) { - const char* param = tmp3->asString()->value_cstr(); + const char* const param = tmp3->asString()->value_cstr(); if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &param)) { dbus_message_unref(message); @@ -144,7 +144,7 @@ } else if (tmp3->isBoolean()) { - bool param = tmp3->asBoolean()->value(); + dbus_bool_t param = tmp3->asBoolean()->value() ? TRUE : FALSE; if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_BOOLEAN, &param)) { dbus_message_unref(message); Modified: trunk/dbus-client/package/yast2-dbus-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dbus-client/package/yast2-dbus-c… ============================================================================== --- trunk/dbus-client/package/yast2-dbus-client.changes (original) +++ trunk/dbus-client/package/yast2-dbus-client.changes Tue May 31 16:06:38 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 31 16:04:48 CEST 2011 - aschnell(a)suse.de + +- fixed passing bool to dbus library +- 2.21.0 + +------------------------------------------------------------------- Mon Jul 27 09:37:48 CEST 2009 - lslezak(a)suse.cz - Initial version (2.18.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] r64176 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/Btrfs.cc libstorage/src/StorageInterface.h libstorage/src/Volume.cc libstorage/src/Volume.h package/yast2-storage.changes
by fehr＠svn2.opensuse.org 31 May '11

31 May '11

Author: fehr Date: Tue May 31 15:12:50 2011 New Revision: 64176 URL: http://svn.opensuse.org/viewcvs/yast?rev=64176&view=rev Log: format multi volume btrfs with mkfs.btrfs and subssequent calls to "btrfs device add ..." Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageInterface.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.h branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc Tue May 31 15:12:50 2011 @@ -263,18 +263,9 @@ int Btrfs::doExtend() { y2mil( "this:" << *this ); - int ret = 0; - bool needUmount = false; - Storage* st = NULL; - string m = getMount(); - if( !isMounted() ) - { - st = getContainer()->getStorage(); - if( st->mountTmp( this, m ) ) - needUmount = true; - else - ret = BTRFS_CANNOT_TMP_MOUNT; - } + bool needUmount; + string m; + int ret = prepareTmpMount( m, needUmount ); list<string> devs = dev_add; list<string>::const_iterator d = devs.begin(); SystemCmd c; @@ -294,12 +285,7 @@ ++d; } if( needUmount ) - { - if( !st->umountDev( device() ) && ret==0 ) - { - ret = BTRFS_CANNOT_TMP_UMOUNT; - } - } + ret = umountTmpMount( ret ); y2mil( "this:" << *this ); y2mil("ret:" << ret); return( ret ); @@ -308,18 +294,9 @@ int Btrfs::doReduce() { y2mil( "this:" << *this ); - int ret = 0; - bool needUmount = false; - Storage* st = NULL; - string m = getMount(); - if( !isMounted() ) - { - st = getContainer()->getStorage(); - if( st->mountTmp( this, m ) ) - needUmount = true; - else - ret = BTRFS_CANNOT_TMP_MOUNT; - } + bool needUmount; + string m; + int ret = prepareTmpMount( m, needUmount ); list<string> devs = dev_rem; list<string>::const_iterator d = devs.begin(); SystemCmd c; @@ -339,12 +316,7 @@ ++d; } if( needUmount ) - { - if( !st->umountDev( device() ) && ret==0 ) - { - ret = BTRFS_CANNOT_TMP_UMOUNT; - } - } + ret = umountTmpMount( ret ); y2mil( "this:" << *this ); y2mil("ret:" << ret); return( ret ); @@ -352,18 +324,9 @@ int Btrfs::doDeleteSubvol() { - int ret = 0; - bool needUmount = false; - Storage* st = NULL; - string m = getMount(); - if( !isMounted() ) - { - st = getContainer()->getStorage(); - if( st->mountTmp( this, m ) ) - needUmount = true; - else - ret = BTRFS_CANNOT_TMP_MOUNT; - } + bool needUmount; + string m; + int ret = prepareTmpMount( m, needUmount ); if( ret==0 ) { SystemCmd c; @@ -383,30 +346,16 @@ } } if( needUmount ) - { - if( !st->umountDev( device() ) && ret==0 ) - { - ret = BTRFS_CANNOT_TMP_UMOUNT; - } - } + ret = umountTmpMount( ret ); y2mil( "ret:" << ret ); return( ret ); } int Btrfs::doCreateSubvol() { - int ret = 0; - bool needUmount = false; - Storage* st = NULL; - string m = getStorage()->prependRoot(getMount()); - if( !isMounted() ) - { - st = getContainer()->getStorage(); - if( st->mountTmp( this, m ) ) - needUmount = true; - else - ret = BTRFS_CANNOT_TMP_MOUNT; - } + bool needUmount; + string m; + int ret = prepareTmpMount( m, needUmount ); if( ret==0 ) { SystemCmd c; @@ -435,12 +384,7 @@ } } if( needUmount ) - { - if( !st->umountDev( device() ) && ret==0 ) - { - ret = BTRFS_CANNOT_TMP_UMOUNT; - } - } + ret = umountTmpMount( ret ); y2mil( "ret:" << ret ); return( ret ); } Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageInterface.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageInterface.h Tue May 31 15:12:50 2011 @@ -746,6 +746,9 @@ VOLUME_REMOUNT_FAILED = -3039, VOLUME_TUNEREISERFS_FAILED = -3040, VOLUME_UMOUNT_NOT_MOUNTED = -3041, + VOLUME_BTRFS_ADD_FAILED = -3042, + VOLUME_CANNOT_TMP_MOUNT = -3043, + VOLUME_CANNOT_TMP_UMOUNT = -3044, LVM_CREATE_PV_FAILED = -4000, LVM_PV_ALREADY_CONTAINED = -4001, Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc Tue May 31 15:12:50 2011 @@ -707,6 +707,30 @@ return( ret ); } +int Volume::prepareTmpMount( string& m, bool& needUmount ) + { + int ret = 0; + needUmount=false; + m = getMount(); + if( !isMounted() ) + { + if( getStorage()->mountTmp( this, m ) ) + needUmount = true; + else + ret = VOLUME_CANNOT_TMP_MOUNT; + } + y2mil( "ret:" << " mp:" << m << " needUmount:" << needUmount ); + return( ret ); + } + +int Volume::umountTmpMount( int ret ) + { + int r = ret; + if( !getStorage()->umountDev( mountDevice() ) && r==0 ) + r = VOLUME_CANNOT_TMP_UMOUNT; + return( r ); + } + Text Volume::formatText( bool doing ) const { Text txt; @@ -794,6 +818,48 @@ return( ret ); } +int Volume::doFormatBtrfs() + { + int ret = 0; + SystemCmd c; + string cmd = "/sbin/mkfs.btrfs " + quote(mountDevice()); + c.execute( cmd ); + if( c.retcode()!=0 ) + { + ret = VOLUME_FORMAT_FAILED; + setExtError( c ); + } + if( ret==0 && cType()==BTRFSC && getEncryption()==ENC_NONE ) + { + const Btrfs* l = static_cast<const Btrfs*>(this); + list<string> li = l->getDevices(); + y2mil( "devices:" << li ); + if( li.size()>1 ) + { + cmd = BTRFSBIN " device add "; + bool needUmount; + string m; + ret = prepareTmpMount( m, needUmount ); + if( ret==0 ) + { + for( list<string>::const_iterator i=li.begin(); i!=li.end(); ++i ) + { + if( *i!=device() && *i!=mountDevice() ) + { + c.execute( cmd + quote(*i) + " " + m ); + if( c.retcode()!=0 ) + ret = VOLUME_BTRFS_ADD_FAILED; + } + } + } + if( needUmount ) + ret = umountTmpMount( ret ); + } + } + y2mil( "ret:" << ret ); + return( ret ); + } + int Volume::doFormat() { static int fcount=1000; @@ -858,9 +924,6 @@ params = "-t ext4 -v"; progressbar = new Mke2fsProgressBar( cb ); break; - case BTRFS: - cmd = "/sbin/mkfs.btrfs"; - break; case REISERFS: cmd = "/sbin/mkreiserfs"; params = "-f -f"; @@ -891,7 +954,9 @@ ret = VOLUME_FORMAT_UNKNOWN_FS; break; } - if( ret==0 ) + if( ret==VOLUME_FORMAT_UNKNOWN_FS && fs==BTRFS ) + ret = doFormatBtrfs(); + if( ret==0 && fs!=BTRFS ) { cmd += " "; if( !mkfs_opt.empty() ) @@ -902,18 +967,7 @@ { cmd += params + " "; } - if( fs==BTRFS && cType()==BTRFSC && getEncryption()==ENC_NONE ) - { - const Btrfs* l = static_cast<const Btrfs*>(this); - list<string> li = l->getDevices(); - for( list<string>::const_iterator i=li.begin(); i!=li.end(); ++i ) - { - cmd += ' '; - cmd += quote(*i ); - } - } - else - cmd += quote(mountDevice()); + cmd += quote(mountDevice()); SystemCmd c; c.setOutputProcessor(progressbar); c.execute( cmd ); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.h Tue May 31 15:12:50 2011 @@ -234,6 +234,9 @@ bool pwdLengthOk( storage::EncryptType typ, const string& val, bool format ) const; bool noFreqPassno() const; + int prepareTmpMount( string& m, bool& needUmount ); + int umountTmpMount( int ret ); + int doFormatBtrfs(); string getLosetupCmd( storage::EncryptType, const string& pwdfile ) const; string getCryptsetupCmd( storage::EncryptType e, const string& dmdev, Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Tue May 31 15:12:50 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 31 15:12:18 CEST 2011 - fehr(a)suse.de + +- format multi volume btrfs with mkfs.btrfs and subssequent calls to + "btrfs device add ..." + +------------------------------------------------------------------- Mon May 30 18:32:40 CEST 2011 - fehr(a)suse.de - add default subvol list to root fs -- 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] r64175 - /tags/branch-Code-11-SP2-2_17_2/fcoe-client/
by gs＠svn2.opensuse.org 31 May '11

31 May '11

Author: gs Date: Tue May 31 14:19:20 2011 New Revision: 64175 URL: http://svn.opensuse.org/viewcvs/yast?rev=64175&view=rev Log: Created tag branch-Code-11-SP2-2_17_2 for fcoe-client Added: tags/branch-Code-11-SP2-2_17_2/fcoe-client/ - copied from r64174, branches/SuSE-Code-11-SP2-Branch/fcoe-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] r64174 - in /trunk/fcoe-client/src: FcoeClient.ycp inst_fcoe-client.ycp
by gs＠svn2.opensuse.org 31 May '11

31 May '11

Author: gs Date: Tue May 31 14:18:27 2011 New Revision: 64174 URL: http://svn.opensuse.org/viewcvs/yast?rev=64174&view=rev Log: add ResetNetworkCards() Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/inst_fcoe-client.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?r… ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Tue May 31 14:18:27 2011 @@ -572,6 +572,11 @@ network_interfaces[row] = card; } +global void ResetNetworkCards() +{ + network_interfaces = []; +} + // // Read /etc/fcoe/config // Modified: trunk/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/inst_fcoe-client… ============================================================================== --- trunk/fcoe-client/src/inst_fcoe-client.ycp (original) +++ trunk/fcoe-client/src/inst_fcoe-client.ycp Tue May 31 14:18:27 2011 @@ -41,20 +41,22 @@ // create /etc/fcoe SCR::Execute(.target.bash, "mkdir -p /etc/fcoe" ); - // TODO: check what is additional needed // - load any modules ? // // FcoeClient::CheckInstalledPackages() not needed in inst-sys // FcoeClient::DetectStartStatus() doesn't make sense in inst-sys -// TODO: check for running network - makes sense here ??? +// check for running network if( !NetworkService::RunningNetworkPopup() ) { y2error( "Network NOT set up" ); return nil; } +// reset global values +FcoeClient::ResetNetworkCards(); + // start services fcoe and lldpad success = FcoeClient::ServiceStatus(); if ( !success ) -- 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] r64173 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src: FcoeClient.ycp inst_fcoe-client.ycp
by gs＠svn2.opensuse.org 31 May '11

31 May '11

Author: gs Date: Tue May 31 14:17:28 2011 New Revision: 64173 URL: http://svn.opensuse.org/viewcvs/yast?rev=64173&view=rev Log: add ResetNetworkCards() Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Tue May 31 14:17:28 2011 @@ -572,6 +572,11 @@ network_interfaces[row] = card; } +global void ResetNetworkCards() +{ + network_interfaces = []; +} + // // Read /etc/fcoe/config // Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp Tue May 31 14:17:28 2011 @@ -41,20 +41,22 @@ // create /etc/fcoe SCR::Execute(.target.bash, "mkdir -p /etc/fcoe" ); - // TODO: check what is additional needed // - load any modules ? // // FcoeClient::CheckInstalledPackages() not needed in inst-sys // FcoeClient::DetectStartStatus() doesn't make sense in inst-sys -// TODO: check for running network - makes sense here ??? +// check for running network if( !NetworkService::RunningNetworkPopup() ) { y2error( "Network NOT set up" ); return nil; } +// reset global values +FcoeClient::ResetNetworkCards(); + // start services fcoe and lldpad success = FcoeClient::ServiceStatus(); if ( !success ) -- 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] r64172 - /trunk/fcoe-client/src/inst_fcoe-client.ycp
by gs＠svn2.opensuse.org 31 May '11

31 May '11

Author: gs Date: Tue May 31 13:52:42 2011 New Revision: 64172 URL: http://svn.opensuse.org/viewcvs/yast?rev=64172&view=rev Log: correct params for PackagesProposal::AddResolvables() Modified: trunk/fcoe-client/src/inst_fcoe-client.ycp Modified: trunk/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/inst_fcoe-client… ============================================================================== --- trunk/fcoe-client/src/inst_fcoe-client.ycp (original) +++ trunk/fcoe-client/src/inst_fcoe-client.ycp Tue May 31 13:52:42 2011 @@ -83,8 +83,9 @@ ret = MainSequence(); y2milestone("MainSequence ret=%1", ret); -// add package open-fcoe to installed system -PackagesProposal::AddResolvables( "open-fcoe"); +// add package open-fcoe to pool that is then used by software proposal +// to propose a selection +PackagesProposal::AddResolvables( "fcoe", `package, ["open-fcoe"] ); // workflow not aborted if ( ret == `next ) -- 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] r64171 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp
by gs＠svn2.opensuse.org 31 May '11

31 May '11

Author: gs Date: Tue May 31 13:51:29 2011 New Revision: 64171 URL: http://svn.opensuse.org/viewcvs/yast?rev=64171&view=rev Log: correct params for PackagesProposal::AddResolvables Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp Tue May 31 13:51:29 2011 @@ -83,8 +83,9 @@ ret = MainSequence(); y2milestone("MainSequence ret=%1", ret); -// add package open-fcoe to installed system -PackagesProposal::AddResolvables( "open-fcoe"); +// add package open-fcoe to pool that is then used by software proposal +// to propose a selection +PackagesProposal::AddResolvables( "fcoe", `package, ["open-fcoe"] ); // workflow not aborted if ( ret == `next ) -- 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] r64170 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp
by gs＠svn2.opensuse.org 31 May '11

31 May '11

Author: gs Date: Tue May 31 13:18:12 2011 New Revision: 64170 URL: http://svn.opensuse.org/viewcvs/yast?rev=64170&view=rev Log: remove logging Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp Tue May 31 13:18:12 2011 @@ -194,7 +194,7 @@ Wizard::CreateDialog(); any ret = Sequencer::Run(aliases, sequence); - y2milestone( "**** RETURN of MainSequence ****: %1", ret ); + UI::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] r64169 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp
by gs＠svn2.opensuse.org 31 May '11

31 May '11

Author: gs Date: Tue May 31 13:18:00 2011 New Revision: 64169 URL: http://svn.opensuse.org/viewcvs/yast?rev=64169&view=rev Log: use PackagesProposal::AddResolvables() Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp Tue May 31 13:18:00 2011 @@ -24,7 +24,7 @@ import "Report"; import "Summary"; import "ModuleLoading"; -import "Packages"; +import "PackagesProposal"; import "Installation"; import "String"; import "FcoeClient"; @@ -84,7 +84,7 @@ y2milestone("MainSequence ret=%1", ret); // add package open-fcoe to installed system -Packages::addAdditionalPackage("open-fcoe"); +PackagesProposal::AddResolvables( "open-fcoe"); // workflow not aborted if ( ret == `next ) -- 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] r64168 - /trunk/fcoe-client/src/wizards.ycp
by gs＠svn2.opensuse.org 31 May '11

31 May '11

Author: gs Date: Tue May 31 13:17:03 2011 New Revision: 64168 URL: http://svn.opensuse.org/viewcvs/yast?rev=64168&view=rev Log: remove logging Modified: trunk/fcoe-client/src/wizards.ycp Modified: trunk/fcoe-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/wizards.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/wizards.ycp (original) +++ trunk/fcoe-client/src/wizards.ycp Tue May 31 13:17:03 2011 @@ -194,7 +194,7 @@ Wizard::CreateDialog(); any ret = Sequencer::Run(aliases, sequence); - y2milestone( "**** RETURN of MainSequence ****: %1", ret ); + UI::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] r64167 - /trunk/fcoe-client/src/inst_fcoe-client.ycp
by gs＠svn2.opensuse.org 31 May '11

31 May '11

Author: gs Date: Tue May 31 13:16:47 2011 New Revision: 64167 URL: http://svn.opensuse.org/viewcvs/yast?rev=64167&view=rev Log: use PackagesProposal::AddResolvables() Modified: trunk/fcoe-client/src/inst_fcoe-client.ycp Modified: trunk/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/inst_fcoe-client… ============================================================================== --- trunk/fcoe-client/src/inst_fcoe-client.ycp (original) +++ trunk/fcoe-client/src/inst_fcoe-client.ycp Tue May 31 13:16:47 2011 @@ -24,7 +24,7 @@ import "Report"; import "Summary"; import "ModuleLoading"; -import "Packages"; +import "PackagesProposal"; import "Installation"; import "String"; import "FcoeClient"; @@ -84,7 +84,7 @@ y2milestone("MainSequence ret=%1", ret); // add package open-fcoe to installed system -Packages::addAdditionalPackage("open-fcoe"); +PackagesProposal::AddResolvables( "open-fcoe"); // workflow not aborted if ( ret == `next ) -- 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] r64166 - /trunk/fcoe-client/VERSION
by gs＠svn2.opensuse.org 31 May '11

31 May '11

Author: gs Date: Tue May 31 12:24:23 2011 New Revision: 64166 URL: http://svn.opensuse.org/viewcvs/yast?rev=64166&view=rev Log: 2.21.2 Modified: trunk/fcoe-client/VERSION Modified: trunk/fcoe-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/VERSION?rev=64166&r1… ============================================================================== --- trunk/fcoe-client/VERSION (original) +++ trunk/fcoe-client/VERSION Tue May 31 12:24:23 2011 @@ -1 +1 @@ -2.21.1 +2.21.2 -- 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] r64165 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION
by gs＠svn2.opensuse.org 31 May '11

31 May '11

Author: gs Date: Tue May 31 12:23:43 2011 New Revision: 64165 URL: http://svn.opensuse.org/viewcvs/yast?rev=64165&view=rev Log: 2.17.22.17.2 Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION Tue May 31 12:23:43 2011 @@ -1 +1 @@ -2.17.1 +2.17.2 -- 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] r64164 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client: package/ src/
by gs＠svn2.opensuse.org 31 May '11

31 May '11

Author: gs Date: Tue May 31 12:23:11 2011 New Revision: 64164 URL: http://svn.opensuse.org/viewcvs/yast?rev=64164&view=rev Log: only start FCoE in installed system, inst_fcoe-client.ycp and fcoe-client_finish.ycp added Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client.desktop branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes Tue May 31 12:23:11 2011 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Tue May 31 12:21:30 CEST 2011 - gs(a)suse.de + +- Create VLAN interface and start FCoE during installation, only + start FCoE in installed system (if VLAN interface exists) +- 'DCB capable' is last column in table of interfaces +- inst_fcoe-client.ycp and fcoe-client_finish.ycp added (needed + for installation workflow) +- V 2.17.2 + +------------------------------------------------------------------- Thu May 19 10:42:41 CEST 2011 - gs(a)suse.de - Main parts of the FCoE configuration are available Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Tue May 31 12:23:11 2011 @@ -272,8 +272,11 @@ y2milestone( "Output: %1", output ); // read stdout (remove \n and white spaces) vlan_device_name = deletechars( output["stdout"]:"", " \n\t" ); - - y2milestone( "Returning: %1", vlan_device_name ); + + if ( vlan_device_name != "" ) + { + y2milestone( "Returning: %1", vlan_device_name ); + } return vlan_device_name; } @@ -287,36 +290,30 @@ if ( vlan_device_name != "") { + // fcoemon reads values from /etc/fcoe/cfg-<vlan-interface> string file_name = sformat( "/etc/fcoe/cfg-%1", vlan_device_name ); y2milestone( "VLAN channel %1 found, reading %2", vlan_device_name, file_name ); content = (string)SCR::Read(.target.string, file_name); if ( content == "" || content == nil ) { - // remove '-fcoe' and try again - file_name = substring( file_name, 0, size(file_name)-5 ); - y2milestone( "Reading %1", file_name ); - content = (string)SCR::Read(.target.string, file_name ); - } - if ( content == "" || content == nil ) - { - string create_file_name = sformat( "/etc/fcoe/cfg-%1", vlan_device_name ); y2milestone( "Cannot read cfg-file creating %1 with default values from /etc/fcoe/cfg-ethx", - create_file_name ); + file_name ); string def_values = (string)SCR::Read( .target.string, "/etc/fcoe/cfg-ethx" ); if ( def_values != "" && def_values != nil ) { - boolean ret = SCR::Write( .target.string, create_file_name, def_values ); + boolean ret = SCR::Write( .target.string, file_name, def_values ); if ( ret == true ) { status_map = add( status_map, "FCOE_ENABLE", "yes"); status_map = add( status_map, "DCB_REQUIRED", "yes"); - status_map = add( status_map, "Filename", create_file_name ); + status_map = add( status_map, "Filename", file_name ); + status_map = add( status_map, "Created", "yes" ); } else { - y2error( "Cannot create %1", create_file_name ); + y2error( "Cannot create %1", file_name ); } } else @@ -331,7 +328,7 @@ } list <string> lines = splitstring( content, "\n" ); - // TODO: better/more elegant way of reading values (use SysConfig agent?) + foreach( string line, (list<string>)lines, { if ( regexpmatch( line, "^FCOE_ENABLE" ) ) { @@ -427,13 +424,12 @@ boolean status = false; status = Service::Enabled( "fcoe" ); - y2milestone( "Status of fcoe: %1", status ); + y2milestone( "Start status of fcoe: %1", status ); service_start = add( service_start, "fcoe", status ); status = Service::Enabled( "lldpad" ); - y2milestone( "Status of lldpad: %1", status ); + y2milestone( "Start status of lldpad: %1", status ); service_start = add( service_start, "lldpad", status ); - } global map<string, boolean> GetStartStatus() @@ -444,7 +440,7 @@ global boolean ServiceStatus() { // TODO - check whether loading any modules in Stage::initial() is required - // (like in IsciClientLib.ycp, line 469 ) + // (like in IsciClientLib.ycp, line 523 ) // probably NOT -> see /etc/init.d/fcoe, line 85 (modprobe fcoe > /dev/null 2>&1) boolean ret = true; @@ -491,12 +487,12 @@ } // -// dev_name device fcoe_vlan dcb_capable fcoe_enable dcb_required vlan_interface modified cfg_file +// dev_name device fcoe_vlan fcoe_enable dcb_required dcb_capable vlan_interface modified cfg_file // eth3 Ethernet card ... eth3.200 yes/no yes/no yes/no 200 yes/no /etc/fcoe/cfg-eth3.200 // // Detect network interface cards (hardware probe) and get status // -boolean DetectNetworkCards() +global boolean DetectNetworkCards() { string vlan_interface = ""; string fcoe_vlan_interface = ""; @@ -517,6 +513,9 @@ if ( vlan_interface == "" ) { // FCoE isn't enabled on the switch - we can't do anything here + // TODO - check link map from .probe.network and distinguish between + // no cable attached and interface not up, Steffen: cannot be used, "no" + // can stand for 'noe cable' or 'not up' fcoe_vlan_interface = NOT_AVAILABLE; } else @@ -538,11 +537,11 @@ info_map = add( info_map, "dev_name", card["dev_name"]:""); // network card, e.g. eth3 info_map = add( info_map, "device", card["device"]:""); // description info_map = add( info_map, "fcoe_vlan", fcoe_vlan_interface ); // FCoE VLAN interface, e.g. eth3.200 - info_map = add( info_map, "dcb_capable", dcb_capable ); // DCB capable info_map = add( info_map, "fcoe_enable", status_map["FCOE_ENABLE"]:""); // FCOE_ENABLE info_map = add( info_map, "dcb_required", status_map["DCB_REQUIRED"]:""); // DCB_REQUIRED + info_map = add( info_map, "dcb_capable", dcb_capable ); // DCB capable info_map = add( info_map, "vlan_interface", vlan_interface ); // VLAN interface, e.g. 200 - info_map = add( info_map, "modified", "no" ); // data not modified + info_map = add( info_map, "modified", status_map["Created"]:"no" ); // data not modified info_map = add( info_map, "cfg_file", status_map["Filename"]:"" ); // cfg file name, e.g. /etc/fcoe/cfg-eth3.200 network_interfaces = add( network_interfaces, info_map ); @@ -576,7 +575,7 @@ // // Read /etc/fcoe/config // -boolean ReadFcoeConfig() +global boolean ReadFcoeConfig() { list <string> options = (list<string>) SCR::Dir(.fcoe); y2milestone( "List of options: %1", options ); @@ -626,7 +625,7 @@ return redo_list; } -boolean WriteFcoeConfig() +global boolean WriteFcoeConfig() { boolean ret = true; @@ -644,7 +643,7 @@ return ret; } -boolean WriteCfgFiles() +global boolean WriteCfgFiles() { list <map> netcards = GetNetworkCards(); boolean success = true; @@ -689,10 +688,15 @@ return success; } -boolean RestartServiceFcoe() +global boolean RestartServiceFcoe() { - y2milestone( "Restarting fcoe"); - return Service::Restart("fcoe"); + boolean ret = true; + if ( FcoeClient::Modified() ) + { + y2milestone( "Restarting fcoe"); + ret = Service::Restart("fcoe"); + } + return ret; } /** @@ -772,11 +776,10 @@ if( !success ) Report::Warning(_("Cannot detect devices.")); sleep(sl); - // read general FCoE settings if(PollAbort()) return false; Progress::NextStage(); - // check daemon fcoemon and lldpad + // read general FCoE settings success = ReadFcoeConfig(); /* Error message */ @@ -827,6 +830,10 @@ ], "" ); + // TODO things to do in case of Mode::autoinst()/autoupgrade() ??? + // see IscsiClient.ycp, line 236, 241 + + // TODO is_running - used or obsolete ??? boolean is_running = Progress::IsRunning(); y2milestone( "**** Progress still running: %1", is_running ); @@ -858,10 +865,8 @@ // adjust start status of services lldpad and fcoe AdjustStartStatus(); - - /* Error message */ - /* TODO - SuSEConfig required ???? */ - if(false) Report::Error (Message::SuSEConfigFailed()); + + // TODO - add additional package ??? like in IscsiClient.ycp, line 257 sleep(sl); if(PollAbort()) return false; Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Tue May 31 12:23:11 2011 @@ -37,19 +37,17 @@ import "Confirm"; import "FcoeClient"; import "Service"; - +import "Stage"; +import "FileUtils"; include "fcoe-client/helps.ycp"; include "fcoe-client/dialogs.ycp"; /** - * Return a modification status - * @return true if data was modified + * Show a popup on abort if data are modified and + * check redo list/execute redo commands. + * @return true if users aborts installation */ -boolean Modified() { - return FcoeClient::Modified(); -} - boolean ReallyAbort() { if ( !FcoeClient::Modified() ) return true; @@ -77,18 +75,13 @@ return abort; } -boolean PollAbort() { - return UI::PollInput() == `abort; -} - /** * Read settings dialog * @return `abort if aborted and `next otherwise */ symbol ReadDialog() { Wizard::RestoreHelp(HELPS["read"]:""); - // TODO - check this - doesn't help to set it here but call PollAbort in FcoeClient directly ??? - //FcoeClient::SetAbortFunction(PollAbort); + if (!Confirm::MustBeRoot()) return `abort; boolean ret = FcoeClient::Read(); return ret ? `next : `abort; @@ -101,7 +94,7 @@ symbol WriteDialog() { Wizard::RestoreHelp(HELPS["write"]:""); y2milestone( "Writing configuration" ); - // FcoeClient::SetAbortFunction(PollAbort); + boolean ret = FcoeClient::Write(); return ret ? `next : `abort; } @@ -178,7 +171,7 @@ foreach ( map card, (list<map>)netcards, { table_items = add( table_items, `item(`id(row), card["dev_name"]:"", card["device"]:"", card["fcoe_vlan"]:"", - card["dcb_capable"]:"", card["fcoe_enable"]:"", card["dcb_required"]:"" ) + card["fcoe_enable"]:"", card["dcb_required"]:"", card["dcb_capable"]:"" ) ); row = row + 1; }); @@ -240,93 +233,170 @@ symbol HandleInterfacesDialog( string id, map event ) { - any action = event["ID"]:nil; - - y2milestone( "Event: %1", event ); + any action = event["ID"]:nil; + + y2milestone( "Event: %1", event ); - if ( action == `edit ) - { - y2milestone( "Action: %1, returning %1", action); - return `edit; - } - else if ( action == `interfaces ) - { - FcoeClient::current_card = (integer)UI::QueryWidget( `id(`interfaces), `CurrentItem ); - AdjustButtons(); - } - else if ( action == `create ) - { - map card = FcoeClient::GetCurrentNetworkCard(); - string dev_name = card["dev_name"]:""; - boolean ret = Popup::YesNoHeadline( _("Creating and starting FCoE on detected VLAN device"), - sformat( _("Do you really want to create a FCoE network + if ( action == `edit ) + { + y2milestone( "Action: %1, returning %1", action); + return `edit; + } + else if ( action == `interfaces ) + { + FcoeClient::current_card = (integer)UI::QueryWidget( `id(`interfaces), `CurrentItem ); + AdjustButtons(); + } + else if ( action == `create ) + { + map card = FcoeClient::GetCurrentNetworkCard(); + string dev_name = card["dev_name"]:""; + + string command = ""; + map output = $[]; + string vlan_interface = ""; + string fcoe_vlan_interface = ""; + map status_map = $[]; + boolean create_ifcfg = false; + string ifcfg_file = ""; + + if ( Stage::initial() ) // first stage - create and start FCoE VLAN interface + { + // headline of a popup: creating and starting Fibre Channel over Ethernet + boolean ret = Popup::YesNoHeadline( _("Creating and starting FCoE on detected VLAN device"), + // question to the user: really create and start FCoE + sformat( _("Do you really want to create a FCoE network interface for discovered FCoE VLAN interface on %1 and start the FCoE initiator?"), dev_name ) ); - if ( ret == true ) - { - string vlan_interface = ""; - string fcoe_vlan_interface = ""; - map status_map = $[]; - // create and start FCoE with 'fipvlan -c -s eth3' - // revert this (in case of 'Abort') with 'vconfig rem eth3.200' - string command = sformat( "fipvlan -c -s %1", dev_name ); - y2milestone( "Executing command: %1", command ); - map output = (map)SCR::Execute( .target.bash_output, command ); - y2milestone( "Output: %1", output ); - - if ( output["exit"]:255 == 0 ) - { - // Get new status and exchange list (table) entry - vlan_interface = FcoeClient::GetVlanInterface( card["dev_name"]:"" ); - if ( vlan_interface == "" ) - { - fcoe_vlan_interface = FcoeClient::NOT_AVAILABLE; - } - else - { - fcoe_vlan_interface = FcoeClient::GetFcoeVlanInterface( card["dev_name"]:"", vlan_interface ); - - if ( fcoe_vlan_interface != "" ) - status_map = FcoeClient::GetFCoEStatus( fcoe_vlan_interface ); - else - fcoe_vlan_interface = FcoeClient::NOT_CONFIGURED; - } - y2milestone( "FCoE VLAN interface: %1", fcoe_vlan_interface ); - // set new value in global map network_interfaces - card["fcoe_vlan"] = fcoe_vlan_interface; - card["fcoe_enable"] = status_map["FCOE_ENABLE"]:""; - card["dcb_required"] = status_map["DCB_REQUIRED"]:""; - card["cfg_file"] = status_map["Filename"]:""; - card["modified"] = "yes"; - FcoeClient::SetModified( true ); - - FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); - y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); - - // replace value in table - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), fcoe_vlan_interface ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), status_map["FCOE_ENABLE"]:"" ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 5), status_map["DCB_REQUIRED"]:"" ); - AdjustButtons(); - if ( fcoe_vlan_interface != "" ) - { - // store command to be able to redo the creation of FCoE VLAN interface - // in case of abort - FcoeClient::AddRedoCommand( sformat("vconfig rem %1", fcoe_vlan_interface ) ); - } - } - else - { - Popup::Error( sformat( _("Cannot create and start FCoE on %1"), dev_name ) ); - } - } - else - { - y2milestone( "Creating VLAN interface canceled" ); - } - } + if ( ret == true ) + { + // create and start FCoE e.g. with 'fipvlan -c -s eth3' + // revert this (in case of 'Abort') with 'vconfig rem eth3.200' + command = sformat( "fipvlan -c -s %1", dev_name ); + y2milestone( "Executing command: %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); + + if ( output["exit"]:255 != 0 ) + { + // text of an error popup + Popup::Error( sformat( _("Cannot create and start FCoE on %1"), dev_name ) ); + return nil; + } + } + else + { + y2milestone( "Creating FCoE VLAN interface canceled" ); + return nil; + } + } + else // installed system - if VLAN already exists only start FCoE + { + // headline of a popup: starting Fibre Channel over Ethernet + boolean ret = Popup::YesNoHeadline( _("Starting FCoE on detected VLAN device"), + // question to the user: really start FCoE + sformat( _("Do you really want to start FCoE initiator +on discovered FCoE VLAN interface on %1?"), dev_name ) ); + if ( ret == true ) + { + ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1\.%2", dev_name, card["vlan_interface"]:"" ); + + // if /etc/sysconfig/network/ifcfg-<vlan-interface> already exists + // call 'ifup' for the interface (creates /proc/net/vlan/<vlan-interface>) + if ( FileUtils::Exists( ifcfg_file ) ) + { + command = sformat( "ifup %1\.%2", dev_name, card["vlan_interface"]:"" ); + y2milestone( "Executing command: %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); - return nil; + if ( output["exit"]:255 == 0 ) + { + // start FCoE + command = sformat( "fipvlan -s %1", dev_name ); + } + else + { + command = sformat( "fipvlan -c -s %1", dev_name ); // create and start FCoE + create_ifcfg = true; + } + } + else + { + command = sformat( "fipvlan -c -s %1", dev_name ); + create_ifcfg = true; + } + + y2milestone( "Executing command: %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); + if ( output["exit"]:255 != 0 ) + { + // text of an error popup: command failed on the network interface + Popup::Error( sformat( _("Command \"%1\" on %2 failed."), command, dev_name ) ); + return nil; + } + } + else + { + y2milestone( "Starting FCoE canceled" ); + return nil; + } + } + + // Get new status and exchange list (table) entry + vlan_interface = FcoeClient::GetVlanInterface( card["dev_name"]:"" ); + if ( vlan_interface == "" ) + { + fcoe_vlan_interface = FcoeClient::NOT_AVAILABLE; + } + else + { + fcoe_vlan_interface = FcoeClient::GetFcoeVlanInterface( card["dev_name"]:"", vlan_interface ); + + if ( fcoe_vlan_interface != "" ) + { + y2milestone( "FCoE VLAN interface %1 created/started", fcoe_vlan_interface ); + status_map = FcoeClient::GetFCoEStatus( fcoe_vlan_interface ); + + // store command to be able to redo the creation of FCoE VLAN interface in case of abort + // TODO: is this also OK if only 'fipvlan -s <interface>' is called? + FcoeClient::AddRedoCommand( sformat("vconfig rem %1", fcoe_vlan_interface ) ); + if ( create_ifcfg ) + { + string config = sformat( "BOOTPROTO=\"static\"\nSTARTMODE=\"onboot\" +ETHERDEVICE=\"%1\"\nUSERCONTROL=\"no\"\nINTERFACETYPE=\"vlan\"\n", dev_name ); + ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1", fcoe_vlan_interface ); + SCR::Write(.target.string, ifcfg_file, config); + y2milestone( "Writing config: %1 to %2", config, ifcfg_file ); + FcoeClient::AddRedoCommand( sformat( "rm %1", ifcfg_file ) ); + } + } + else + { + fcoe_vlan_interface = FcoeClient::NOT_CONFIGURED; + } + } + + // set new values in global map network_interfaces + card["fcoe_vlan"] = fcoe_vlan_interface; + card["fcoe_enable"] = status_map["FCOE_ENABLE"]:""; + card["dcb_required"] = status_map["DCB_REQUIRED"]:""; + card["cfg_file"] = status_map["Filename"]:""; + card["modified"] = "yes"; + FcoeClient::SetModified( true ); + + FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); + y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); + + // replace values in table + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), fcoe_vlan_interface ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 3), status_map["FCOE_ENABLE"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), status_map["DCB_REQUIRED"]:"" ); + AdjustButtons(); + } + + return nil; } symbol HandleConfigurationDialog( string id, map event ) @@ -373,12 +443,22 @@ void StoreConfigurationDialog (string id, map event) { y2milestone( "Store configuration dialog" ); + + map config = FcoeClient::GetFcoeConfig(); + string debug_val = (string)UI::QueryWidget( `id("debug"), `Value ); + if ( config["DEBUG"]:"" != debug_val) + { + FcoeClient::SetFcoeConfigValue( "DEBUG", debug_val ); + FcoeClient::SetModified( true ); + } string syslog_val = (string)UI::QueryWidget( `id("syslog"), `Value ); - FcoeClient::SetFcoeConfigValue( "DEBUG", debug_val ); - FcoeClient::SetFcoeConfigValue( "USE_SYSLOG", syslog_val ); - FcoeClient::SetModified( true ); + if ( config["USE_SYSLOG"]:"" != syslog_val ) + { + FcoeClient::SetFcoeConfigValue( "USE_SYSLOG", syslog_val ); + FcoeClient::SetModified( true ); + } } void StoreEditDialog (string id, map event) Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp Tue May 31 12:23:11 2011 @@ -119,8 +119,8 @@ return `MarginBox( mbox_x, mbox_y, `VBox( `Table(`id(`interfaces), `opt(`notify, `immediate, `keepSorting ), - `header(_("Device Name"), _("Model"), _("FCoE VLAN Interface"), _("DCB capable"), - _("FCoE Enable"), _("DCB Required")), + `header(_("Device Name"), _("Model"), _("FCoE VLAN Interface"), + _("FCoE Enable"), _("DCB Required"), _("DCB capable") ), [] ), `Left(`HBox( `PushButton(`id(`edit), _("Change &Settings") ), Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client.desktop URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client.desktop (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client.desktop Tue May 31 12:23:11 2011 @@ -16,7 +16,7 @@ X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstResource=fcoe-client -Icon=yast-fcoe-client +Icon=fcoe Exec=/sbin/yast2 fcoe-client Name=FCoE Client Configuration Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp Tue May 31 12:23:11 2011 @@ -27,30 +27,74 @@ import "Packages"; import "Installation"; import "String"; +import "FcoeClient"; +import "NetworkService"; + include "fcoe-client/wizards.ycp"; /* main ui function */ any ret = nil; +boolean success = false; y2milestone("fcoe-client module started during installation"); -// TODO: check what is needed here -// - create directories (included in open-fcoe?) -// - load any modules ? -// - start fcoemon (started in FcoeClient::ServiceStatus()) +// create /etc/fcoe +SCR::Execute(.target.bash, "mkdir -p /etc/fcoe" ); + -//SCR::Execute(.target.bash, "mkdir -p /etc/iscsi; touch /etc/iscsi/initiatorname.iscsi; ln -s /etc/iscsi/initiatorname.iscsi /etc/initiatorname.iscsi"); -// ModuleLoading::Load("iscsi_tcp", "", "", "", false, true); -// start iscsid daemon -// IscsiClientLib::startIScsid(); -// IscsiClientLib::autoLogOn(); +// TODO: check what is additional needed +// - load any modules ? +// +// FcoeClient::CheckInstalledPackages() not needed in inst-sys +// FcoeClient::DetectStartStatus() doesn't make sense in inst-sys + +// TODO: check for running network - makes sense here ??? +if( !NetworkService::RunningNetworkPopup() ) +{ + y2error( "Network NOT set up" ); + return nil; +} + +// start services fcoe and lldpad +success = FcoeClient::ServiceStatus(); +if ( !success ) +{ + y2error( "Starting of services FAILED" ); + return nil; +} + +// detect netcards +success = FcoeClient::DetectNetworkCards(); +if ( !success ) +{ + y2error( "Detecting netcards FAILED" ); + return nil; +} + +// read general FCoE settings +success = FcoeClient::ReadFcoeConfig(); +if ( !success ) +{ + y2error( "Reading /etc/fcoe/config FAILED" ); + return nil; +} // run dialog ret = MainSequence(); -y2debug("MainSequence ret=%1", ret); -// add package open-iscsi to installed system +y2milestone("MainSequence ret=%1", ret); + +// add package open-fcoe to installed system Packages::addAdditionalPackage("open-fcoe"); +// workflow not aborted +if ( ret == `next ) +{ + // write changes to config files + FcoeClient::WriteFcoeConfig(); + FcoeClient::WriteCfgFiles(); + FcoeClient::RestartServiceFcoe(); +} + /* Finish */ y2milestone("fcoe-client module finished"); y2milestone("----------------------------------------"); Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp Tue May 31 12:23:11 2011 @@ -194,7 +194,7 @@ Wizard::CreateDialog(); any ret = Sequencer::Run(aliases, sequence); - + y2milestone( "**** RETURN of MainSequence ****: %1", ret ); UI::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] r64163 - in /trunk/fcoe-client: package/yast2-fcoe-client.changes src/FcoeClient.ycp src/Makefile.am src/inst_fcoe-client.ycp src/wizards.ycp
by gs＠svn2.opensuse.org 31 May '11

31 May '11

Author: gs Date: Tue May 31 12:19:11 2011 New Revision: 64163 URL: http://svn.opensuse.org/viewcvs/yast?rev=64163&view=rev Log: changes for installation workflow Modified: trunk/fcoe-client/package/yast2-fcoe-client.changes trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/Makefile.am trunk/fcoe-client/src/inst_fcoe-client.ycp trunk/fcoe-client/src/wizards.ycp Modified: trunk/fcoe-client/package/yast2-fcoe-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/package/yast2-fcoe-c… ============================================================================== --- trunk/fcoe-client/package/yast2-fcoe-client.changes (original) +++ trunk/fcoe-client/package/yast2-fcoe-client.changes Tue May 31 12:19:11 2011 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu May 26 14:24:19 CEST 2011 - gs(a)suse.de + +- Create VLAN interface and start FCoE during installation, only + start FCoE in installed system (if VLAN interface exists) +- 'DCB capable' is last column in table of interfaces +- inst_fcoe-client.ycp and fcoe-client_finish.ycp added (needed + for installation workflow) +- V 2.21.2 + +------------------------------------------------------------------- Wed May 18 14:07:58 CEST 2011 - gs(a)suse.de - Main parts of the FCoE configuration are available Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?r… ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Tue May 31 12:19:11 2011 @@ -492,7 +492,7 @@ // // Detect network interface cards (hardware probe) and get status // -boolean DetectNetworkCards() +global boolean DetectNetworkCards() { string vlan_interface = ""; string fcoe_vlan_interface = ""; @@ -575,7 +575,7 @@ // // Read /etc/fcoe/config // -boolean ReadFcoeConfig() +global boolean ReadFcoeConfig() { list <string> options = (list<string>) SCR::Dir(.fcoe); y2milestone( "List of options: %1", options ); @@ -625,7 +625,7 @@ return redo_list; } -boolean WriteFcoeConfig() +global boolean WriteFcoeConfig() { boolean ret = true; @@ -643,7 +643,7 @@ return ret; } -boolean WriteCfgFiles() +global boolean WriteCfgFiles() { list <map> netcards = GetNetworkCards(); boolean success = true; @@ -688,7 +688,7 @@ return success; } -boolean RestartServiceFcoe() +global boolean RestartServiceFcoe() { boolean ret = true; if ( FcoeClient::Modified() ) @@ -776,11 +776,10 @@ if( !success ) Report::Warning(_("Cannot detect devices.")); sleep(sl); - // read general FCoE settings if(PollAbort()) return false; Progress::NextStage(); - // check daemon fcoemon and lldpad + // read general FCoE settings success = ReadFcoeConfig(); /* Error message */ Modified: trunk/fcoe-client/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/Makefile.am?rev=… ============================================================================== --- trunk/fcoe-client/src/Makefile.am (original) +++ trunk/fcoe-client/src/Makefile.am Tue May 31 12:19:11 2011 @@ -5,7 +5,9 @@ client_DATA = \ fcoe-client.ycp \ fcoe-client_auto.ycp \ - fcoe-client_proposal.ycp + fcoe-client_proposal.ycp \ + fcoe-client_finish.ycp \ + inst_fcoe-client.ycp ynclude_DATA = \ helps.ycp \ Modified: trunk/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/inst_fcoe-client… ============================================================================== --- trunk/fcoe-client/src/inst_fcoe-client.ycp (original) +++ trunk/fcoe-client/src/inst_fcoe-client.ycp Tue May 31 12:19:11 2011 @@ -27,30 +27,74 @@ import "Packages"; import "Installation"; import "String"; +import "FcoeClient"; +import "NetworkService"; + include "fcoe-client/wizards.ycp"; /* main ui function */ any ret = nil; +boolean success = false; y2milestone("fcoe-client module started during installation"); -// TODO: check what is needed here -// - create directories (included in open-fcoe?) -// - load any modules ? -// - start fcoemon (started in FcoeClient::ServiceStatus()) +// create /etc/fcoe +SCR::Execute(.target.bash, "mkdir -p /etc/fcoe" ); + -//SCR::Execute(.target.bash, "mkdir -p /etc/iscsi; touch /etc/iscsi/initiatorname.iscsi; ln -s /etc/iscsi/initiatorname.iscsi /etc/initiatorname.iscsi"); -// ModuleLoading::Load("iscsi_tcp", "", "", "", false, true); -// start iscsid daemon -// IscsiClientLib::startIScsid(); -// IscsiClientLib::autoLogOn(); +// TODO: check what is additional needed +// - load any modules ? +// +// FcoeClient::CheckInstalledPackages() not needed in inst-sys +// FcoeClient::DetectStartStatus() doesn't make sense in inst-sys + +// TODO: check for running network - makes sense here ??? +if( !NetworkService::RunningNetworkPopup() ) +{ + y2error( "Network NOT set up" ); + return nil; +} + +// start services fcoe and lldpad +success = FcoeClient::ServiceStatus(); +if ( !success ) +{ + y2error( "Starting of services FAILED" ); + return nil; +} + +// detect netcards +success = FcoeClient::DetectNetworkCards(); +if ( !success ) +{ + y2error( "Detecting netcards FAILED" ); + return nil; +} + +// read general FCoE settings +success = FcoeClient::ReadFcoeConfig(); +if ( !success ) +{ + y2error( "Reading /etc/fcoe/config FAILED" ); + return nil; +} // run dialog ret = MainSequence(); -y2debug("MainSequence ret=%1", ret); -// add package open-iscsi to installed system +y2milestone("MainSequence ret=%1", ret); + +// add package open-fcoe to installed system Packages::addAdditionalPackage("open-fcoe"); +// workflow not aborted +if ( ret == `next ) +{ + // write changes to config files + FcoeClient::WriteFcoeConfig(); + FcoeClient::WriteCfgFiles(); + FcoeClient::RestartServiceFcoe(); +} + /* Finish */ y2milestone("fcoe-client module finished"); y2milestone("----------------------------------------"); Modified: trunk/fcoe-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/wizards.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/wizards.ycp (original) +++ trunk/fcoe-client/src/wizards.ycp Tue May 31 12:19:11 2011 @@ -194,7 +194,7 @@ Wizard::CreateDialog(); any ret = Sequencer::Run(aliases, sequence); - + y2milestone( "**** RETURN of MainSequence ****: %1", ret ); UI::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] r64162 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client_finish.ycp
by gs＠svn2.opensuse.org 31 May '11

31 May '11

Author: gs Date: Tue May 31 10:41:41 2011 New Revision: 64162 URL: http://svn.opensuse.org/viewcvs/yast?rev=64162&view=rev Log: needed for installation workflow, do final steps Added: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client_finish.ycp Added: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client_finish.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client_finish.ycp Tue May 31 10:41:41 2011 @@ -0,0 +1,69 @@ +/** + * File: + * fcoe-client_finish.ycp + * + * Module: + * Step of base installation finish + * + * Authors: + * Gabriele Mohr <gs(a)suse.de> + * + */ + +{ + +textdomain "fcoe-client"; + +import "Directory"; +import "String"; +import "FcoeClient"; +import "Service"; +include "installation/misc.ycp"; + +any ret = nil; +string func = ""; +map param = $[]; + +/* Check arguments */ +if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { + func = (string)WFM::Args(0); + if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) + param = (map)WFM::Args(1); +} + +y2milestone ("starting fcoe-client_finish"); +y2debug("func=%1", func); +y2debug("param=%1", param); + +if (func == "Info") +{ + return (any)$[ + "steps" : 1, + // progress step title + "title" : _("Saving fcoe configuration..."), + "when" : [ `installation, `update, `autoinst ], + ]; +} +else if (func == "Write") +{ + // copy fcoe config files to destdir + WFM::Execute (.local.bash,"test -d /etc/fcoe/ && mkdir -p '" + String::Quote(Installation::destdir) + "/etc/fcoe' && cp -a /etc/fcoe/* '" + String::Quote(Installation::destdir) + "/etc/fcoe/'"); + + // TODO: only enable if any FCoE VLAN interface was enabled + Service::Enable("fcoe"); + Service::Enable("lldpad"); + y2milestone("fcoe and lldpad services enabled"); + +} +else +{ + y2error ("unknown function: %1", func); + ret = nil; +} + +y2debug("ret=%1", ret); +y2milestone("fcoe-client_finish finished"); +return ret; + + +} /* 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] r64161 - /trunk/fcoe-client/src/fcoe-client_finish.ycp
by gs＠svn2.opensuse.org 31 May '11

31 May '11

Author: gs Date: Tue May 31 10:40:41 2011 New Revision: 64161 URL: http://svn.opensuse.org/viewcvs/yast?rev=64161&view=rev Log: needed for installation workflow, do final steps Added: trunk/fcoe-client/src/fcoe-client_finish.ycp Added: trunk/fcoe-client/src/fcoe-client_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/fcoe-client_fini… ============================================================================== --- trunk/fcoe-client/src/fcoe-client_finish.ycp (added) +++ trunk/fcoe-client/src/fcoe-client_finish.ycp Tue May 31 10:40:41 2011 @@ -0,0 +1,69 @@ +/** + * File: + * fcoe-client_finish.ycp + * + * Module: + * Step of base installation finish + * + * Authors: + * Gabriele Mohr <gs(a)suse.de> + * + */ + +{ + +textdomain "fcoe-client"; + +import "Directory"; +import "String"; +import "FcoeClient"; +import "Service"; +include "installation/misc.ycp"; + +any ret = nil; +string func = ""; +map param = $[]; + +/* Check arguments */ +if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { + func = (string)WFM::Args(0); + if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) + param = (map)WFM::Args(1); +} + +y2milestone ("starting fcoe-client_finish"); +y2debug("func=%1", func); +y2debug("param=%1", param); + +if (func == "Info") +{ + return (any)$[ + "steps" : 1, + // progress step title + "title" : _("Saving fcoe configuration..."), + "when" : [ `installation, `update, `autoinst ], + ]; +} +else if (func == "Write") +{ + // copy fcoe config files to destdir + WFM::Execute (.local.bash,"test -d /etc/fcoe/ && mkdir -p '" + String::Quote(Installation::destdir) + "/etc/fcoe' && cp -a /etc/fcoe/* '" + String::Quote(Installation::destdir) + "/etc/fcoe/'"); + + // TODO: only enable if any FCoE VLAN interface was enabled + Service::Enable("fcoe"); + Service::Enable("lldpad"); + y2milestone("fcoe and lldpad services enabled"); + +} +else +{ + y2error ("unknown function: %1", func); + ret = nil; +} + +y2debug("ret=%1", ret); +y2milestone("fcoe-client_finish finished"); +return ret; + + +} /* 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] r64160 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/Makefile.am
by gs＠svn2.opensuse.org 31 May '11

31 May '11

Author: gs Date: Tue May 31 09:40:39 2011 New Revision: 64160 URL: http://svn.opensuse.org/viewcvs/yast?rev=64160&view=rev Log: fcoe-client_finish.ycp and inst_fcoe-client.ycp added Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/Makefile.am Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/Makefile.am Tue May 31 09:40:39 2011 @@ -5,7 +5,9 @@ client_DATA = \ fcoe-client.ycp \ fcoe-client_auto.ycp \ - fcoe-client_proposal.ycp + fcoe-client_proposal.ycp \ + fcoe-client_finish.ycp \ + inst_fcoe-client.ycp ynclude_DATA = \ helps.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] r64159 - /trunk/slide-show/package/yast2-slide-show.changes
by keichwa＠svn2.opensuse.org 31 May '11

31 May '11

Author: keichwa Date: Tue May 31 09:32:45 2011 New Revision: 64159 URL: http://svn.opensuse.org/viewcvs/yast?rev=64159&view=rev Log: .changes Modified: trunk/slide-show/package/yast2-slide-show.changes Modified: trunk/slide-show/package/yast2-slide-show.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/slide-show/package/yast2-slide-s… ============================================================================== --- trunk/slide-show/package/yast2-slide-show.changes (original) +++ trunk/slide-show/package/yast2-slide-show.changes Tue May 31 09:32:45 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 31 09:31:35 CEST 2011 - ke(a)suse.de + +- 2.21.0 +- Update openSUSE slide show template text; provided by aj. + +------------------------------------------------------------------- Mon Feb 14 13:14:42 CET 2011 - ke(a)suse.de - 2.19.2 -- 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] r64158 - /tags/stable-2_21_0/slide-show/
by keichwa＠svn2.opensuse.org 31 May '11

31 May '11

Author: keichwa Date: Tue May 31 09:06:03 2011 New Revision: 64158 URL: http://svn.opensuse.org/viewcvs/yast?rev=64158&view=rev Log: Created tag stable-2_21_0 for slide-show Added: tags/stable-2_21_0/slide-show/ - copied from r64157, trunk/slide-show/ -- 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] r64157 - /trunk/slide-show/VERSION
by keichwa＠svn2.opensuse.org 31 May '11

31 May '11

Author: keichwa Date: Tue May 31 09:04:28 2011 New Revision: 64157 URL: http://svn.opensuse.org/viewcvs/yast?rev=64157&view=rev Log: 2.21.0 Modified: trunk/slide-show/VERSION Modified: trunk/slide-show/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/slide-show/VERSION?rev=64157&r1=… ============================================================================== --- trunk/slide-show/VERSION (original) +++ trunk/slide-show/VERSION Tue May 31 09:04:28 2011 @@ -1 +1 @@ -2.19.1 +2.21.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] r64156 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_dialogs.ycp storage/src/include/ep-dialogs.ycp storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 30 May '11

30 May '11

Author: fehr Date: Mon May 30 19:10:07 2011 New Revision: 64156 URL: http://svn.opensuse.org/viewcvs/yast?rev=64156&view=rev Log: add default subvol list to root fs Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/include/ep-dialogs.ycp 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 May 30 19:10:07 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 30 18:32:40 CEST 2011 - fehr(a)suse.de + +- add default subvol list to root fs + +------------------------------------------------------------------- Thu May 26 16:07:46 CEST 2011 - fehr(a)suse.de - remove unsupported state of btrfs 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 Mon May 30 19:10:07 2011 @@ -1266,7 +1266,13 @@ list<string> SubvolNames( map<string,any> data ) { list<string> items = maplist( map p, - filter( map s, data["subvol"]:[], ``(!s["delete"]:false)), + filter( map s, data["subvol"]:[], + { + if( data["format"]:false ) + return( s["create"]:false ); + else + return( !s["delete"]:false ); + }), {return p["name"]:"";}); y2milestone( "items:%1", items ); return( items ); Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Mon May 30 19:10:07 2011 @@ -449,6 +449,18 @@ if (!data["format"]:false) data = filter(string key, any value, data, { return key != "fs_options"; }); + if( data["mount"]:""=="/" && data["used_fs"]:`unknown==`btrfs && + data["format"]:false ) + { + y2milestone( "before AddSubvolRoot subvol:%1", data["subvol"]:[] ); + list<map> lsc = filter( map s, data["subvol"]:[], ``(s["create"]:false)); + y2milestone( "before AddSubvolRoot list:%1", lsc ); + if( size(lsc)==0 ) + { + data = (map<string,any>)Storage::AddSubvolRoot( data ); + y2milestone( "after AddSubvolRoot subvol:%1", data["subvol"]:[] ); + } + } if (contains([`primary, `extended, `logical], data["type"]:`unknown)) if (data["fsid"]:0 != orig_data["fsid"]:0) 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 May 30 19:10:07 2011 @@ -514,6 +514,8 @@ global define void SetTargetMap( map<string,map> target ); global define map<string,map> SetPartitionData( map<string,map> target, string device, string key, any value ); +global define map<string,map> DelPartitionData( map<string,map> target, string device, + string key ); define list<map> GetDiskPartitionTg( string device, map<string,map> tg ) @@ -1804,13 +1806,26 @@ filter( map p, tg["/dev/btrfs","partitions"]:[], ``(size(p["devices"]:[])>1)); y2milestone( "HandleBtrfsSimpleVolumes simple %1", simple ); - list<string> keys = [ "subvol", "uuid", "format", "fstype", "inactive", "mount", "mountby", "used_fs" ]; + list<string> keys = [ "subvol", "uuid", "format", "inactive", "mount", "mountby", "used_fs" ]; foreach( map p, simple, { - y2milestone( "HandleBtrfsSimpleVolumes before %1", GetPartition( tg, p["device"]:"" )); + map mp = GetPartition( tg, p["device"]:"" ); + y2milestone( "HandleBtrfsSimpleVolumes before %1", mp ); foreach( string k, keys, { - tg = SetPartitionData( tg, p["device"]:"", k, p[k]:(any)"" ); + if( p[k]:nil!=nil ) + { + y2milestone( "HandleBtrfsSimpleVolumes set key %1", k ); + tg = SetPartitionData( tg, p["device"]:"", k, p[k]:nil ); + } + else + { + if( haskey( mp, k )); + { + y2milestone( "HandleBtrfsSimpleVolumes remove key %1", k ); + tg = DelPartitionData( tg, p["device"]:"", k ); + } + } }); y2milestone( "HandleBtrfsSimpleVolumes after %1", GetPartition( tg, p["device"]:"" )); }); @@ -4233,6 +4248,15 @@ } +global define map AddSubvolRoot( map part ) + { + list<string> def_subvol = [ "tmp", "var/tmp", "var/run" ]; + part["subvol"] = maplist( string s, def_subvol, + { return $[ "create":true, "name":s ]; }); + y2milestone( "AddSubvolRoot part:%1", part ); + return( part ); + } + global define map SetVolOptions( map p, string mnt, symbol fs, string fs_opts, string fstab_opts, string label ) { @@ -4281,9 +4305,7 @@ } if( ret["format"]:false && ret["used_fs"]:`unknown==`btrfs && mnt=="/" ) { - list<string> def_subvol = [ "tmp", "var/tmp", "var/run" ]; - ret["subvol"] = maplist( string s, def_subvol, - { return $[ "create" :true, "name" :s ]; }); + ret = AddSubvolRoot( ret ); } if( size(fstab_opts)>0 ) ret["fstopt"] = fstab_opts; -- 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] r64155 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/ package/ storage/src/include/ storage/src/modules/
by fehr＠svn2.opensuse.org 30 May '11

30 May '11

Author: fehr Date: Mon May 30 19:06:15 2011 New Revision: 64155 URL: http://svn.opensuse.org/viewcvs/yast?rev=64155&view=rev Log: add default subvol list to root fs Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/custom_part_dialogs.ycp branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-dialogs.ycp branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc Mon May 30 19:06:15 2011 @@ -117,7 +117,7 @@ list<Subvolume>::iterator i=subvol.begin(); while( i!=subvol.end() && !i->deleted() && i->path()!=name ) ++i; - if( i==subvol.end() ) + if( i==subvol.end() || getFormat() ) { Subvolume v( name ); v.setCreated(); Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Mon May 30 19:06:15 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 30 18:32:40 CEST 2011 - fehr(a)suse.de + +- add default subvol list to root fs + +------------------------------------------------------------------- Mon May 30 15:18:54 CEST 2011 - aschnell(a)suse.de - increased major version number of library (bnc#627422) Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/custom_part_dialogs.ycp Mon May 30 19:06:15 2011 @@ -1266,7 +1266,13 @@ list<string> SubvolNames( map<string,any> data ) { list<string> items = maplist( map p, - filter( map s, data["subvol"]:[], ``(!s["delete"]:false)), + filter( map s, data["subvol"]:[], + { + if( data["format"]:false ) + return( s["create"]:false ); + else + return( !s["delete"]:false ); + }), {return p["name"]:"";}); y2milestone( "items:%1", items ); return( items ); Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-dialogs.ycp Mon May 30 19:06:15 2011 @@ -449,6 +449,18 @@ if (!data["format"]:false) data = filter(string key, any value, data, { return key != "fs_options"; }); + if( data["mount"]:""=="/" && data["used_fs"]:`unknown==`btrfs && + data["format"]:false ) + { + y2milestone( "before AddSubvolRoot subvol:%1", data["subvol"]:[] ); + list<map> lsc = filter( map s, data["subvol"]:[], ``(s["create"]:false)); + y2milestone( "before AddSubvolRoot list:%1", lsc ); + if( size(lsc)==0 ) + { + data = (map<string,any>)Storage::AddSubvolRoot( data ); + y2milestone( "after AddSubvolRoot subvol:%1", data["subvol"]:[] ); + } + } if (contains([`primary, `extended, `logical], data["type"]:`unknown)) if (data["fsid"]:0 != orig_data["fsid"]:0) Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Mon May 30 19:06:15 2011 @@ -514,6 +514,8 @@ global define void SetTargetMap( map<string,map> target ); global define map<string,map> SetPartitionData( map<string,map> target, string device, string key, any value ); +global define map<string,map> DelPartitionData( map<string,map> target, string device, + string key ); define list<map> GetDiskPartitionTg( string device, map<string,map> tg ) @@ -1804,13 +1806,26 @@ filter( map p, tg["/dev/btrfs","partitions"]:[], ``(size(p["devices"]:[])>1)); y2milestone( "HandleBtrfsSimpleVolumes simple %1", simple ); - list<string> keys = [ "subvol", "uuid", "format", "fstype", "inactive", "mount", "mountby", "used_fs" ]; + list<string> keys = [ "subvol", "uuid", "format", "inactive", "mount", "mountby", "used_fs" ]; foreach( map p, simple, { - y2milestone( "HandleBtrfsSimpleVolumes before %1", GetPartition( tg, p["device"]:"" )); + map mp = GetPartition( tg, p["device"]:"" ); + y2milestone( "HandleBtrfsSimpleVolumes before %1", mp ); foreach( string k, keys, { - tg = SetPartitionData( tg, p["device"]:"", k, p[k]:(any)"" ); + if( p[k]:nil!=nil ) + { + y2milestone( "HandleBtrfsSimpleVolumes set key %1", k ); + tg = SetPartitionData( tg, p["device"]:"", k, p[k]:nil ); + } + else + { + if( haskey( mp, k )); + { + y2milestone( "HandleBtrfsSimpleVolumes remove key %1", k ); + tg = DelPartitionData( tg, p["device"]:"", k ); + } + } }); y2milestone( "HandleBtrfsSimpleVolumes after %1", GetPartition( tg, p["device"]:"" )); }); @@ -4233,6 +4248,15 @@ } +global define map AddSubvolRoot( map part ) + { + list<string> def_subvol = [ "tmp", "var/tmp", "var/run" ]; + part["subvol"] = maplist( string s, def_subvol, + { return $[ "create":true, "name":s ]; }); + y2milestone( "AddSubvolRoot part:%1", part ); + return( part ); + } + global define map SetVolOptions( map p, string mnt, symbol fs, string fs_opts, string fstab_opts, string label ) { @@ -4281,9 +4305,7 @@ } if( ret["format"]:false && ret["used_fs"]:`unknown==`btrfs && mnt=="/" ) { - list<string> def_subvol = [ "tmp", "var/tmp", "var/run" ]; - ret["subvol"] = maplist( string s, def_subvol, - { return $[ "create" :true, "name" :s ]; }); + ret = AddSubvolRoot( ret ); } if( size(fstab_opts)>0 ) ret["fstopt"] = fstab_opts; -- 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] r64154 - in /trunk/online-update-configuration: VERSION package/yast2-online-update-configuration.changes yast2-online-update-configuration.spec.in
by jdsn＠svn2.opensuse.org 30 May '11

30 May '11

Author: jdsn Date: Mon May 30 17:02:30 2011 New Revision: 64154 URL: http://svn.opensuse.org/viewcvs/yast?rev=64154&view=rev Log: add split-provides to keep this module in zypper dup (bnc#695449), version 2.19.1 Modified: trunk/online-update-configuration/VERSION trunk/online-update-configuration/package/yast2-online-update-configuration.changes trunk/online-update-configuration/yast2-online-update-configuration.spec.in Modified: trunk/online-update-configuration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update-configuration/VERS… ============================================================================== --- trunk/online-update-configuration/VERSION (original) +++ trunk/online-update-configuration/VERSION Mon May 30 17:02:30 2011 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/online-update-configuration/package/yast2-online-update-configuration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update-configuration/pack… ============================================================================== --- trunk/online-update-configuration/package/yast2-online-update-configuration.changes (original) +++ trunk/online-update-configuration/package/yast2-online-update-configuration.changes Mon May 30 17:02:30 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 30 14:46:54 CEST 2011 - jdsn(a)suse.de + +- add split-provides to keep this module in zypper dup (bnc#695449) +- 2.19.1 + +------------------------------------------------------------------- Fri Apr 8 15:56:56 CEST 2011 - jdsn(a)suse.de - fix proxy settings in automatic online update script, bnc#(678888) Modified: trunk/online-update-configuration/yast2-online-update-configuration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update-configuration/yast… ============================================================================== --- trunk/online-update-configuration/yast2-online-update-configuration.spec.in (original) +++ trunk/online-update-configuration/yast2-online-update-configuration.spec.in Mon May 30 17:02:30 2011 @@ -24,6 +24,7 @@ Requires: yast2-packager >= 2.17.0 Requires: yast2-pkg-bindings >= 2.17.20 Conflicts: yast2-registration <= 2.19.1 +Provides: registration:/usr/share/YaST2/clients/online_update_configuration.ycp PreReq: %fillup_prereq BuildRequires: yast2 >= 2.17.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] r64153 - in /branches/SuSE-Code-11-SP1-Branch/network: ./ VERSION package/yast2-network.changes src/lan/YaPI/NETWORK.pm
by mvidner＠svn2.opensuse.org 30 May '11

30 May '11

Author: mvidner Date: Mon May 30 17:02:18 2011 New Revision: 64153 URL: http://svn.opensuse.org/viewcvs/yast?rev=64153&view=rev Log: YaPI::NETWORK::Write: also update /etc/hosts, for hostname -f (bnc#694283#c8) The bug is most apparent in WebYaST where it will show the old hostname. Plus a harmless™ code reformatting, minus dead code, minus unused "use". Merged from trunk r64127:64152 Modified: branches/SuSE-Code-11-SP1-Branch/network/ (props changed) branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Mon May 30 17:02:18 2011 @@ -1 +1 @@ -2.17.153 +2.17.154 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Mon May 30 17:02:18 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 30 16:40:55 CEST 2011 - mvidner(a)suse.cz + +- WebYaST: also update /etc/hosts, for hostname -f (bnc#694283#c8) +- 2.17.154 + +------------------------------------------------------------------- Wed Apr 13 16:17:19 CEST 2011 - mvidner(a)suse.cz - AutoYaST: networking/start_immediately was ignored (bnc#655571, bnc#675844) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm Mon May 30 17:02:18 2011 @@ -4,11 +4,11 @@ use YaST::YCP qw(:LOGGING); use YaPI; use Data::Dumper; -use Switch; # ------------------- imported modules YaST::YCP::Import ("LanItems"); YaST::YCP::Import ("Hostname"); +YaST::YCP::Import ("Host"); YaST::YCP::Import ("DNS"); YaST::YCP::Import ("Routing"); # ------------------------------------- @@ -19,43 +19,53 @@ # TODO: parameter map<string, boolean> what_I_Need BEGIN{$TYPEINFO{Read} = ["function", - [ "map", "string", "any"]]; + [ "map", "string", "any"]]; } sub Read { - my $self = shift; + my $self = shift; -# Hostname->Read(); - DNS->Read(); - Routing->Read(); - LanItems->Read(); - - my %interfaces = (); - foreach my $devnum (keys %{LanItems->Items}){ - LanItems->current($devnum); - if (LanItems->IsItemConfigured()){ - my %configuration = (); - LanItems->SetItem(); - if (LanItems->isCurrentDHCP()){ - %configuration = ( 'bootproto' => LanItems->bootproto ); - } elsif (LanItems->bootproto eq "static"){ - %configuration = ( 'bootproto' => 'static' ); - $configuration{'ipaddr'} = LanItems->ipaddr . "/" . LanItems->prefix; - } - $interfaces{LanItems->interfacename}=\%configuration; - } elsif (LanItems->getCurrentItem()->{'hwinfo'}->{'type'} eq "eth") { - my $device = LanItems->getCurrentItem()->{"hwinfo"}->{"dev_name"}; - $interfaces{$device}= {}; + DNS->Read(); + Routing->Read(); + LanItems->Read(); + + my %interfaces = (); + foreach my $devnum (keys %{LanItems->Items}){ + LanItems->current($devnum); + if (LanItems->IsItemConfigured()){ + my %configuration = (); + LanItems->SetItem(); + if (LanItems->isCurrentDHCP()){ + %configuration = ( 'bootproto' => LanItems->bootproto ); + } elsif (LanItems->bootproto eq "static"){ + %configuration = ( 'bootproto' => 'static' ); + $configuration{'ipaddr'} = LanItems->ipaddr . "/" . LanItems->prefix; + } + $interfaces{LanItems->interfacename}=\%configuration; + } elsif (LanItems->getCurrentItem()->{'hwinfo'}->{'type'} eq "eth") { + my $device = LanItems->getCurrentItem()->{"hwinfo"}->{"dev_name"}; + $interfaces{$device}= {}; } - } + } - #FIXME: validate for nil values (dns espacially) - my %ret = ('interfaces'=>\%interfaces, - 'routes'=>{'default'=>{'via'=>Routing->GetGateway()}}, - 'dns'=>{'nameservers'=>\@{DNS->nameservers}, 'searches'=>\@{DNS->searchlist}}, - 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain, 'dhcp_hostname'=>DNS->dhcp_hostname} -# 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain} - ); - return \%ret; + #FIXME: validate for nil values (dns espacially) + my %ret = ( + 'interfaces' => \%interfaces, + 'routes' => { + 'default' => { + 'via' => Routing->GetGateway() + } + }, + 'dns' => { + 'nameservers' => \@{DNS->nameservers}, + 'searches' => \@{DNS->searchlist} + }, + 'hostname' => { + 'name' => Hostname->CurrentHostname, + 'domain' => Hostname->CurrentDomain, + 'dhcp_hostname' => DNS->dhcp_hostname + } + ); + return \%ret; } sub writeRoute { @@ -66,121 +76,124 @@ my $dest=""; my @route = (); if (defined ($args->{'route'}->{'default'}->{'via'})){ - $gw = $args->{'route'}->{'default'}->{'via'}; - if ($gw ne ""){ - YaST::YCP::Import ("IP"); - unless (IP->Check4($gw)) { - $ret{'exit'} = -1; - $ret{'error'} = IP->Valid4(); - return \%ret; - }; - $dest = "default"; - @route = ( {"destination" => $dest, + $gw = $args->{'route'}->{'default'}->{'via'}; + if ($gw ne ""){ + YaST::YCP::Import ("IP"); + unless (IP->Check4($gw)) { + $ret{'exit'} = -1; + $ret{'error'} = IP->Valid4(); + return \%ret; + }; + $dest = "default"; + @route = ( {"destination" => $dest, "gateway" => $gw, "netmask" => "-", "device" => "-" - }); - } + }); + } } Routing->Read(); y2milestone("YaPI->Write before change Routes:", Dumper(Routing->Routes)); Routing->Routes( \@route ); y2milestone("YaPI->Write after change Routes:", Dumper(Routing->Routes)); Routing->Write(); - return \%ret; + return \%ret; } sub writeHostname { - my $args = shift; - my $ret = {'exit'=>0, 'error'=>''}; - y2milestone("hostname", Dumper(\$args->{'hostname'})); - DNS->Read(); - DNS->hostname($args->{'hostname'}->{'name'}); - DNS->domain($args->{'hostname'}->{'domain'}); - DNS->dhcp_hostname($args->{'hostname'}->{'dhcp_hostname'}) if (defined $args->{'hostname'}->{'dhcp_hostname'}); - DNS->modified(1); - DNS->Write(); - return $ret; + my $args = shift; + my $ret = {'exit'=>0, 'error'=>''}; + y2milestone("hostname", Dumper(\$args->{'hostname'})); + DNS->Read(); + DNS->hostname($args->{'hostname'}->{'name'}); + DNS->domain($args->{'hostname'}->{'domain'}); + DNS->dhcp_hostname($args->{'hostname'}->{'dhcp_hostname'}) if (defined $args->{'hostname'}->{'dhcp_hostname'}); + DNS->modified(1); + DNS->Write(); + Host->Read(); + Host->EnsureHostnameResolvable(); + Host->Write(); + return $ret; } sub writeDNS { - my $args = shift; - my $ret = {'exit'=>0, 'error'=>''}; - y2milestone("dns", Dumper(\$args->{'dns'})); - DNS->Read(); - DNS->nameservers($args->{'dns'}->{'nameservers'}); - DNS->searchlist($args->{'dns'}->{'searches'}); - DNS->modified(1); - DNS->Write(); - return $ret; + my $args = shift; + my $ret = {'exit'=>0, 'error'=>''}; + y2milestone("dns", Dumper(\$args->{'dns'})); + DNS->Read(); + DNS->nameservers($args->{'dns'}->{'nameservers'}); + DNS->searchlist($args->{'dns'}->{'searches'}); + DNS->modified(1); + DNS->Write(); + return $ret; } sub writeInterfaces { - my $args = shift; - my $ret = {'exit'=>0, 'error'=>''}; - y2milestone("interface", Dumper(\$args->{'interface'})); - foreach my $dev (keys %{$args->{'interface'}}){ - YaST::YCP::Import ("NetworkInterfaces"); - NetworkInterfaces->Read(); - NetworkInterfaces->Add() unless NetworkInterfaces->Edit($dev); - NetworkInterfaces->Name($dev); - my $ip = $args->{'interface'}->{$dev}->{'ipaddr'}; - my $prefix="32"; - YaST::YCP::Import ("Netmask"); - my @ip_row = split(/\//, $ip); - $prefix = $ip_row[$#ip_row]; - if (Netmask->Check4($prefix) && $prefix =~ /\./){ - y2milestone("Valid netmask: ", $prefix, " will change to prefixlen"); - $prefix = Netmask->ToBits($prefix); - } - $ip = $ip_row[0]."/".$prefix; - my %config=("STARTMODE" => "auto", - "BOOTPROTO" => $args->{'interface'}->{$dev}->{'bootproto'}, - "IPADDR" => $ip - ); - NetworkInterfaces->Current(\%config); - NetworkInterfaces->Commit(); - NetworkInterfaces->Write(""); - YaST::YCP::Import ("Service"); - Service->Restart("network"); - } - return $ret; + my $args = shift; + my $ret = {'exit'=>0, 'error'=>''}; + y2milestone("interface", Dumper(\$args->{'interface'})); + foreach my $dev (keys %{$args->{'interface'}}){ + YaST::YCP::Import ("NetworkInterfaces"); + NetworkInterfaces->Read(); + NetworkInterfaces->Add() unless NetworkInterfaces->Edit($dev); + NetworkInterfaces->Name($dev); + my $ip = $args->{'interface'}->{$dev}->{'ipaddr'}; + my $prefix="32"; + YaST::YCP::Import ("Netmask"); + my @ip_row = split(/\//, $ip); + $prefix = $ip_row[$#ip_row]; + if (Netmask->Check4($prefix) && $prefix =~ /\./){ + y2milestone("Valid netmask: ", $prefix, " will change to prefixlen"); + $prefix = Netmask->ToBits($prefix); + } + $ip = $ip_row[0]."/".$prefix; + my %config=("STARTMODE" => "auto", + "BOOTPROTO" => $args->{'interface'}->{$dev}->{'bootproto'}, + "IPADDR" => $ip + ); + NetworkInterfaces->Current(\%config); + NetworkInterfaces->Commit(); + NetworkInterfaces->Write(""); + YaST::YCP::Import ("Service"); + Service->Restart("network"); + } + return $ret; } BEGIN{$TYPEINFO{Write} = ["function", - ["map","string","any"],["map","string","any"]]; + ["map","string","any"],["map","string","any"]]; } sub Write { - my $self = shift; - my $args = shift; - y2milestone("YaPI->Write with settings:", Dumper(\$args)); - - # SAVE DEFAULT ROUTE - if (exists($args->{'route'})){ - my $route_ret = writeRoute($args); - return $route_ret if ($route_ret->{'exit'} != 0); - } - # SAVE HOSTNAME - if (exists($args->{'hostname'})){ - my $hn_ret = writeHostname($args); - return $hn_ret if ($hn_ret->{'exit'} != 0); - } - # SAVE DNS Settings - if (exists($args->{'dns'})){ - my $dns_ret = writeDNS($args); - return $dns_ret if ($dns_ret->{'exit'} != 0); - } - # SAVE interfaces Settings - if (exists($args->{'interface'})){ - my $ifc_ret = writeInterfaces($args); - return $ifc_ret if ($ifc_ret->{'exit'} != 0); - } - - # return value for exit is type integer, but it'll be converted into string (in yast-perl-bindings) - # that means in rest-api it'll be {'exit'=>'0', 'error'=>''} - return {'exit'=>0, 'error'=>''}; + my $self = shift; + my $args = shift; + y2milestone("YaPI->Write with settings:", Dumper(\$args)); + + # SAVE DEFAULT ROUTE + if (exists($args->{'route'})){ + my $route_ret = writeRoute($args); + return $route_ret if ($route_ret->{'exit'} != 0); + } + # SAVE HOSTNAME + if (exists($args->{'hostname'})){ + my $hn_ret = writeHostname($args); + return $hn_ret if ($hn_ret->{'exit'} != 0); + } + # SAVE DNS Settings + if (exists($args->{'dns'})){ + my $dns_ret = writeDNS($args); + return $dns_ret if ($dns_ret->{'exit'} != 0); + } + # SAVE interfaces Settings + if (exists($args->{'interface'})){ + my $ifc_ret = writeInterfaces($args); + return $ifc_ret if ($ifc_ret->{'exit'} != 0); + } + + # return value for exit is type integer, but it'll be converted into string (in yast-perl-bindings) + # that means in rest-api it'll be {'exit'=>'0', 'error'=>''} + return {'exit'=>0, 'error'=>''}; } 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] r64152 - in /trunk/network: VERSION package/yast2-network.changes src/lan/YaPI/NETWORK.pm
by mvidner＠svn2.opensuse.org 30 May '11

30 May '11

Author: mvidner Date: Mon May 30 16:42:45 2011 New Revision: 64152 URL: http://svn.opensuse.org/viewcvs/yast?rev=64152&view=rev Log: YaPI::NETWORK::Write: also update /etc/hosts, for hostname -f (bnc#694283#c8) The bug is most apparent in WebYaST where it will show the old hostname. Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/YaPI/NETWORK.pm Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=64152&r1=641… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon May 30 16:42:45 2011 @@ -1 +1 @@ -2.20.11 +2.20.12 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 May 30 16:42:45 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 30 16:40:55 CEST 2011 - mvidner(a)suse.cz + +- WebYaST: also update /etc/hosts, for hostname -f (bnc#694283#c8) +- 2.20.12 + +------------------------------------------------------------------- Thu May 26 15:44:14 UTC 2011 - coolo(a)novell.com - Switch is not used, so don't require it (removed from perl 5.13.1) Modified: trunk/network/src/lan/YaPI/NETWORK.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/YaPI/NETWORK.pm?… ============================================================================== --- trunk/network/src/lan/YaPI/NETWORK.pm (original) +++ trunk/network/src/lan/YaPI/NETWORK.pm Mon May 30 16:42:45 2011 @@ -8,6 +8,7 @@ # ------------------- imported modules YaST::YCP::Import ("LanItems"); YaST::YCP::Import ("Hostname"); +YaST::YCP::Import ("Host"); YaST::YCP::Import ("DNS"); YaST::YCP::Import ("Routing"); # ------------------------------------- @@ -109,6 +110,9 @@ DNS->dhcp_hostname($args->{'hostname'}->{'dhcp_hostname'}) if (defined $args->{'hostname'}->{'dhcp_hostname'}); DNS->modified(1); DNS->Write(); + Host->Read(); + Host->EnsureHostnameResolvable(); + Host->Write(); 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] r64151 - /trunk/network/src/lan/YaPI/NETWORK.pm
by mvidner＠svn2.opensuse.org 30 May '11

30 May '11

Author: mvidner Date: Mon May 30 16:30:48 2011 New Revision: 64151 URL: http://svn.opensuse.org/viewcvs/yast?rev=64151&view=rev Log: More readability: no commented-out code; data structure alignment. Modified: trunk/network/src/lan/YaPI/NETWORK.pm Modified: trunk/network/src/lan/YaPI/NETWORK.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/YaPI/NETWORK.pm?… ============================================================================== --- trunk/network/src/lan/YaPI/NETWORK.pm (original) +++ trunk/network/src/lan/YaPI/NETWORK.pm Mon May 30 16:30:48 2011 @@ -23,7 +23,6 @@ sub Read { my $self = shift; -# Hostname->Read(); DNS->Read(); Routing->Read(); LanItems->Read(); @@ -48,11 +47,22 @@ } #FIXME: validate for nil values (dns espacially) - my %ret = ('interfaces'=>\%interfaces, - 'routes'=>{'default'=>{'via'=>Routing->GetGateway()}}, - 'dns'=>{'nameservers'=>\@{DNS->nameservers}, 'searches'=>\@{DNS->searchlist}}, - 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain, 'dhcp_hostname'=>DNS->dhcp_hostname} -# 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain} + my %ret = ( + 'interfaces' => \%interfaces, + 'routes' => { + 'default' => { + 'via' => Routing->GetGateway() + } + }, + 'dns' => { + 'nameservers' => \@{DNS->nameservers}, + 'searches' => \@{DNS->searchlist} + }, + 'hostname' => { + 'name' => Hostname->CurrentHostname, + 'domain' => Hostname->CurrentDomain, + 'dhcp_hostname' => DNS->dhcp_hostname + } ); 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] r64150 - /trunk/network/src/lan/YaPI/NETWORK.pm
by mvidner＠svn2.opensuse.org 30 May '11

30 May '11

Author: mvidner Date: Mon May 30 16:17:11 2011 New Revision: 64150 URL: http://svn.opensuse.org/viewcvs/yast?rev=64150&view=rev Log: Reindent the mess! - http://perldoc.perl.org/perlstyle.html and http://doc.opensuse.org/projects/YaST/openSUSE11.3/codingrules/indentation.… agree on 4 columns - no tabs Modified: trunk/network/src/lan/YaPI/NETWORK.pm Modified: trunk/network/src/lan/YaPI/NETWORK.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/YaPI/NETWORK.pm?… ============================================================================== --- trunk/network/src/lan/YaPI/NETWORK.pm (original) +++ trunk/network/src/lan/YaPI/NETWORK.pm Mon May 30 16:17:11 2011 @@ -18,43 +18,43 @@ # TODO: parameter map<string, boolean> what_I_Need BEGIN{$TYPEINFO{Read} = ["function", - [ "map", "string", "any"]]; + [ "map", "string", "any"]]; } sub Read { - my $self = shift; + my $self = shift; # Hostname->Read(); - DNS->Read(); - Routing->Read(); - LanItems->Read(); - - my %interfaces = (); - foreach my $devnum (keys %{LanItems->Items}){ - LanItems->current($devnum); - if (LanItems->IsItemConfigured()){ - my %configuration = (); - LanItems->SetItem(); - if (LanItems->isCurrentDHCP()){ - %configuration = ( 'bootproto' => LanItems->bootproto ); - } elsif (LanItems->bootproto eq "static"){ - %configuration = ( 'bootproto' => 'static' ); - $configuration{'ipaddr'} = LanItems->ipaddr . "/" . LanItems->prefix; - } - $interfaces{LanItems->interfacename}=\%configuration; - } elsif (LanItems->getCurrentItem()->{'hwinfo'}->{'type'} eq "eth") { - my $device = LanItems->getCurrentItem()->{"hwinfo"}->{"dev_name"}; - $interfaces{$device}= {}; + DNS->Read(); + Routing->Read(); + LanItems->Read(); + + my %interfaces = (); + foreach my $devnum (keys %{LanItems->Items}){ + LanItems->current($devnum); + if (LanItems->IsItemConfigured()){ + my %configuration = (); + LanItems->SetItem(); + if (LanItems->isCurrentDHCP()){ + %configuration = ( 'bootproto' => LanItems->bootproto ); + } elsif (LanItems->bootproto eq "static"){ + %configuration = ( 'bootproto' => 'static' ); + $configuration{'ipaddr'} = LanItems->ipaddr . "/" . LanItems->prefix; + } + $interfaces{LanItems->interfacename}=\%configuration; + } elsif (LanItems->getCurrentItem()->{'hwinfo'}->{'type'} eq "eth") { + my $device = LanItems->getCurrentItem()->{"hwinfo"}->{"dev_name"}; + $interfaces{$device}= {}; } - } + } - #FIXME: validate for nil values (dns espacially) - my %ret = ('interfaces'=>\%interfaces, + #FIXME: validate for nil values (dns espacially) + my %ret = ('interfaces'=>\%interfaces, 'routes'=>{'default'=>{'via'=>Routing->GetGateway()}}, 'dns'=>{'nameservers'=>\@{DNS->nameservers}, 'searches'=>\@{DNS->searchlist}}, 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain, 'dhcp_hostname'=>DNS->dhcp_hostname} # 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain} - ); - return \%ret; + ); + return \%ret; } sub writeRoute { @@ -65,121 +65,121 @@ my $dest=""; my @route = (); if (defined ($args->{'route'}->{'default'}->{'via'})){ - $gw = $args->{'route'}->{'default'}->{'via'}; - if ($gw ne ""){ - YaST::YCP::Import ("IP"); - unless (IP->Check4($gw)) { - $ret{'exit'} = -1; - $ret{'error'} = IP->Valid4(); - return \%ret; - }; - $dest = "default"; - @route = ( {"destination" => $dest, + $gw = $args->{'route'}->{'default'}->{'via'}; + if ($gw ne ""){ + YaST::YCP::Import ("IP"); + unless (IP->Check4($gw)) { + $ret{'exit'} = -1; + $ret{'error'} = IP->Valid4(); + return \%ret; + }; + $dest = "default"; + @route = ( {"destination" => $dest, "gateway" => $gw, "netmask" => "-", "device" => "-" - }); - } + }); + } } Routing->Read(); y2milestone("YaPI->Write before change Routes:", Dumper(Routing->Routes)); Routing->Routes( \@route ); y2milestone("YaPI->Write after change Routes:", Dumper(Routing->Routes)); Routing->Write(); - return \%ret; + return \%ret; } sub writeHostname { - my $args = shift; - my $ret = {'exit'=>0, 'error'=>''}; - y2milestone("hostname", Dumper(\$args->{'hostname'})); - DNS->Read(); - DNS->hostname($args->{'hostname'}->{'name'}); - DNS->domain($args->{'hostname'}->{'domain'}); - DNS->dhcp_hostname($args->{'hostname'}->{'dhcp_hostname'}) if (defined $args->{'hostname'}->{'dhcp_hostname'}); - DNS->modified(1); - DNS->Write(); - return $ret; + my $args = shift; + my $ret = {'exit'=>0, 'error'=>''}; + y2milestone("hostname", Dumper(\$args->{'hostname'})); + DNS->Read(); + DNS->hostname($args->{'hostname'}->{'name'}); + DNS->domain($args->{'hostname'}->{'domain'}); + DNS->dhcp_hostname($args->{'hostname'}->{'dhcp_hostname'}) if (defined $args->{'hostname'}->{'dhcp_hostname'}); + DNS->modified(1); + DNS->Write(); + return $ret; } sub writeDNS { - my $args = shift; - my $ret = {'exit'=>0, 'error'=>''}; - y2milestone("dns", Dumper(\$args->{'dns'})); - DNS->Read(); - DNS->nameservers($args->{'dns'}->{'nameservers'}); - DNS->searchlist($args->{'dns'}->{'searches'}); - DNS->modified(1); - DNS->Write(); - return $ret; + my $args = shift; + my $ret = {'exit'=>0, 'error'=>''}; + y2milestone("dns", Dumper(\$args->{'dns'})); + DNS->Read(); + DNS->nameservers($args->{'dns'}->{'nameservers'}); + DNS->searchlist($args->{'dns'}->{'searches'}); + DNS->modified(1); + DNS->Write(); + return $ret; } sub writeInterfaces { - my $args = shift; - my $ret = {'exit'=>0, 'error'=>''}; - y2milestone("interface", Dumper(\$args->{'interface'})); - foreach my $dev (keys %{$args->{'interface'}}){ - YaST::YCP::Import ("NetworkInterfaces"); - NetworkInterfaces->Read(); - NetworkInterfaces->Add() unless NetworkInterfaces->Edit($dev); - NetworkInterfaces->Name($dev); - my $ip = $args->{'interface'}->{$dev}->{'ipaddr'}; - my $prefix="32"; - YaST::YCP::Import ("Netmask"); - my @ip_row = split(/\//, $ip); - $prefix = $ip_row[$#ip_row]; - if (Netmask->Check4($prefix) && $prefix =~ /\./){ - y2milestone("Valid netmask: ", $prefix, " will change to prefixlen"); - $prefix = Netmask->ToBits($prefix); - } - $ip = $ip_row[0]."/".$prefix; - my %config=("STARTMODE" => "auto", - "BOOTPROTO" => $args->{'interface'}->{$dev}->{'bootproto'}, - "IPADDR" => $ip - ); - NetworkInterfaces->Current(\%config); - NetworkInterfaces->Commit(); - NetworkInterfaces->Write(""); - YaST::YCP::Import ("Service"); - Service->Restart("network"); - } - return $ret; + my $args = shift; + my $ret = {'exit'=>0, 'error'=>''}; + y2milestone("interface", Dumper(\$args->{'interface'})); + foreach my $dev (keys %{$args->{'interface'}}){ + YaST::YCP::Import ("NetworkInterfaces"); + NetworkInterfaces->Read(); + NetworkInterfaces->Add() unless NetworkInterfaces->Edit($dev); + NetworkInterfaces->Name($dev); + my $ip = $args->{'interface'}->{$dev}->{'ipaddr'}; + my $prefix="32"; + YaST::YCP::Import ("Netmask"); + my @ip_row = split(/\//, $ip); + $prefix = $ip_row[$#ip_row]; + if (Netmask->Check4($prefix) && $prefix =~ /\./){ + y2milestone("Valid netmask: ", $prefix, " will change to prefixlen"); + $prefix = Netmask->ToBits($prefix); + } + $ip = $ip_row[0]."/".$prefix; + my %config=("STARTMODE" => "auto", + "BOOTPROTO" => $args->{'interface'}->{$dev}->{'bootproto'}, + "IPADDR" => $ip + ); + NetworkInterfaces->Current(\%config); + NetworkInterfaces->Commit(); + NetworkInterfaces->Write(""); + YaST::YCP::Import ("Service"); + Service->Restart("network"); + } + return $ret; } BEGIN{$TYPEINFO{Write} = ["function", - ["map","string","any"],["map","string","any"]]; + ["map","string","any"],["map","string","any"]]; } sub Write { - my $self = shift; - my $args = shift; - y2milestone("YaPI->Write with settings:", Dumper(\$args)); - - # SAVE DEFAULT ROUTE - if (exists($args->{'route'})){ - my $route_ret = writeRoute($args); - return $route_ret if ($route_ret->{'exit'} != 0); - } - # SAVE HOSTNAME - if (exists($args->{'hostname'})){ - my $hn_ret = writeHostname($args); - return $hn_ret if ($hn_ret->{'exit'} != 0); - } - # SAVE DNS Settings - if (exists($args->{'dns'})){ - my $dns_ret = writeDNS($args); - return $dns_ret if ($dns_ret->{'exit'} != 0); - } - # SAVE interfaces Settings - if (exists($args->{'interface'})){ - my $ifc_ret = writeInterfaces($args); - return $ifc_ret if ($ifc_ret->{'exit'} != 0); - } - - # return value for exit is type integer, but it'll be converted into string (in yast-perl-bindings) - # that means in rest-api it'll be {'exit'=>'0', 'error'=>''} - return {'exit'=>0, 'error'=>''}; + my $self = shift; + my $args = shift; + y2milestone("YaPI->Write with settings:", Dumper(\$args)); + + # SAVE DEFAULT ROUTE + if (exists($args->{'route'})){ + my $route_ret = writeRoute($args); + return $route_ret if ($route_ret->{'exit'} != 0); + } + # SAVE HOSTNAME + if (exists($args->{'hostname'})){ + my $hn_ret = writeHostname($args); + return $hn_ret if ($hn_ret->{'exit'} != 0); + } + # SAVE DNS Settings + if (exists($args->{'dns'})){ + my $dns_ret = writeDNS($args); + return $dns_ret if ($dns_ret->{'exit'} != 0); + } + # SAVE interfaces Settings + if (exists($args->{'interface'})){ + my $ifc_ret = writeInterfaces($args); + return $ifc_ret if ($ifc_ret->{'exit'} != 0); + } + + # return value for exit is type integer, but it'll be converted into string (in yast-perl-bindings) + # that means in rest-api it'll be {'exit'=>'0', 'error'=>''} + return {'exit'=>0, 'error'=>''}; } 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] r64149 - /tags/branch-Code-11-SP2-2_17_3/snapper/
by jsuchome＠svn2.opensuse.org 30 May '11

30 May '11

Author: jsuchome Date: Mon May 30 16:06:35 2011 New Revision: 64149 URL: http://svn.opensuse.org/viewcvs/yast?rev=64149&view=rev Log: Created tag branch-Code-11-SP2-2_17_3 for snapper Added: tags/branch-Code-11-SP2-2_17_3/snapper/ - copied from r64148, branches/SuSE-Code-11-SP2-Branch/snapper/ -- 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] r64148 - in /branches/SuSE-Code-11-SP2-Branch/snapper: VERSION agent-snapper/doc/snapper.html agent-snapper/src/SnapperAgent.cc package/yast2-snapper.changes src/Snapper.ycp
by jsuchome＠svn2.opensuse.org 30 May '11

30 May '11

Author: jsuchome Date: Mon May 30 16:06:28 2011 New Revision: 64148 URL: http://svn.opensuse.org/viewcvs/yast?rev=64148&view=rev Log: - ask snapper library for snapshot paths - 2.17.3 Modified: branches/SuSE-Code-11-SP2-Branch/snapper/VERSION branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/doc/snapper.html branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/src/SnapperAgent.cc branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp Modified: branches/SuSE-Code-11-SP2-Branch/snapper/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/VERSION Mon May 30 16:06:28 2011 @@ -1 +1 @@ -2.17.2 +2.17.3 Modified: branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/doc/snapper.html URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/doc/snapper.html (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/doc/snapper.html Mon May 30 16:06:28 2011 @@ -56,6 +56,21 @@ </td> </tr> + <tr><td><tt>.snapper.path</td><td>YCPMap</td><td align="left">YCPMap</td> + <td>Return the path to directory with given snapshot<br> + <b>Example of argument map</b>: + <pre> + $[ + "num" : 1, + $] + </pre> + <b>Example of result</b>: + <pre> + "/snapshots/1/snapshot" + </pre> + </td> + </tr> + <tr><td><tt>.snapper.snapshots</td><td>(none)</td><td align="left">YCPList</td> <td>Return list of current snapshot maps.<br> <b>Example of result</b>: Modified: branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/src/SnapperAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/src/SnapperAgent.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/src/SnapperAgent.cc Mon May 30 16:06:28 2011 @@ -148,7 +148,7 @@ if (path->length() == 1) { /** - * error: Read (.snapper.error) -> returns last error message + * Read (.snapper.error) -> returns last error message */ if (PC(0) == "error") { YCPMap retmap; @@ -156,6 +156,21 @@ return retmap; } /** + * Read (.snapper.path, $[ "num" : num]) -> returns the path to directory with given snapshot + */ + if (PC(0) == "path") { + unsigned int num = getIntValue (argmap, "num", 0); + const Snapshots& snapshots = sh->getSnapshots(); + Snapshots::const_iterator snap = snapshots.find(num); + if (snap == snapshots.end()) + { + y2error ("snapshot '%d' not found", num); + return ret; + } + return YCPString (snap->snapshotDir()); + } + + /** * Read(.snapper.snapshots) -> return list of snapshot description maps */ if (PC(0) == "snapshots") { Modified: branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes Mon May 30 16:06:28 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 30 14:56:42 CEST 2011 - jsuchome(a)suse.cz + +- ask snapper library for snapshot paths +- 2.17.3 + +------------------------------------------------------------------- Wed May 11 11:35:31 CEST 2011 - jsuchome(a)suse.cz - only require libsnapper-devel Modified: branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp Mon May 30 16:06:28 2011 @@ -43,8 +43,6 @@ // global list of all snapshot global list<map> snapshots = []; -global string snapshots_path = "/snapshots"; - global map selected_snapshot = $[]; // mapping of snapshot number to index in snapshots list @@ -70,15 +68,28 @@ } /** + * Return the path to given snapshot + */ +global string GetSnapshotPath (integer snapshot_num) { + string ret = (string) SCR::Read (.snapper.path, $[ "num" : snapshot_num ]); + if (ret == nil) + { + ret = ""; + // popup error + Report::Error (sformat (_("Snapshot '%1' was not found."), snapshot_num)); + } + return ret; +} + +/** * Describe what was done with given file between given snapshots * - when new is 0, meaning is 'current system' */ global map GetFileModification (string file, integer old, integer new) { map ret = $[]; - - string file1 = sformat ("%1/%2/snapshot%3", snapshots_path, old, file); - string file2 = sformat ("%1/%2/snapshot%3", snapshots_path, new, file); + string file1 = sformat ("%1%2", GetSnapshotPath (old), file); + string file2 = sformat ("%1%2", GetSnapshotPath (new), file); if (new == 0) file2 = file; @@ -270,7 +281,7 @@ UI::ChangeWidget (`id (`progress ), `Value, progress); - string orig = sformat ("%1/%2/snapshot", snapshots_path, snapshot_num) + file; + string orig = GetSnapshotPath (snapshot_num) + file; string dir = substring (file, 0, findlastof (file, "/")); if (!FileUtils::Exists (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] r64147 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/Makefile.am package/yast2-storage.changes
by aschnell＠svn2.opensuse.org 30 May '11

30 May '11

Author: aschnell Date: Mon May 30 15:19:58 2011 New Revision: 64147 URL: http://svn.opensuse.org/viewcvs/yast?rev=64147&view=rev Log: - increased major version number of library (bnc#627422) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am Mon May 30 15:19:58 2011 @@ -88,7 +88,7 @@ Region.cc Region.h \ StorageTmpl.h StorageDefines.h -liby2storage_la_LDFLAGS = -version-info 2:0 +liby2storage_la_LDFLAGS = -version-info 3:0 liby2storage_la_LIBADD = -lblocxx -lxml2 plugin_LTLIBRARIES = libpy2StorageCallbacks.la Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Mon May 30 15:19:58 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 30 15:18:54 CEST 2011 - aschnell(a)suse.de + +- increased major version number of library (bnc#627422) + +------------------------------------------------------------------- Mon May 30 14:01:57 CEST 2011 - fehr(a)suse.de - testsuite is BuildRequires not Requires -- 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] r64146 - /trunk/slide-show/SuSELinux/slideshow.xml
by keichwa＠svn2.opensuse.org 30 May '11

30 May '11

Author: keichwa Date: Mon May 30 15:01:41 2011 New Revision: 64146 URL: http://svn.opensuse.org/viewcvs/yast?rev=64146&view=rev Log: update, submitted by aj Modified: trunk/slide-show/SuSELinux/slideshow.xml Modified: trunk/slide-show/SuSELinux/slideshow.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/slide-show/SuSELinux/slideshow.x… ============================================================================== --- trunk/slide-show/SuSELinux/slideshow.xml (original) +++ trunk/slide-show/SuSELinux/slideshow.xml Mon May 30 15:01:41 2011 @@ -30,7 +30,7 @@ <title>openSUSE.org</title> <para> -openSUSE is a community project created and sponsored by Novell to +openSUSE is a community project created and sponsored by SUSE to deliver the world's most user-friendly computing platform. Many people from around the world contribute to the openSUSE Project by packaging software, testing programs, writing documentation, and translating @@ -68,7 +68,7 @@ performance, and a number of improvements designed to protect your privacy and prevent phishing attacks.</para> -<para>Also included with openSUSE are Novell Evolution and Kontact, +<para>Also included with openSUSE are Evolution and Kontact, complete e-mail and contact management applications. For instant messaging, openSUSE features easy to use IM clients that support all of the popular protocols: AIM, Google Talk, Jabber, MSN, Yahoo!, @@ -92,11 +92,11 @@ <para> The openSUSE &suse-version; distribution comes complete with the latest version -of the leading Linux productivity suite, OpenOffice.org. It features a word +of the leading Linux productivity suite, LibreOffice. It features a word processor, spreadsheet application, HTML editor, presentation designer, and database manager. It reads and writes multiple formatsâincluding Microsoft Office formatsâso you can move back and forth easily between openSUSE -and popular non-Linux productivity software. OpenOffice.org is the perfect +and popular non-Linux productivity software. LibreOffice is the perfect choice for reports, papers, home budgets, simple graphics and more.</para> </section> @@ -160,8 +160,8 @@ robust solutions for virtualization available. In addition, openSUSE provides tools for network file sharing (Samba, NFS, etc.), printing (CUPS) and Web hosting (Apache). For application development, openSUSE comes with a complete -set of runtime environments plus extensive application development tools, -including KDevelop, Eclipse and Mono.</para> +set of runtime environments plus extensive application development tools. +</para> </section> @@ -206,17 +206,17 @@ </section> <section label="12_novell"> - <title>Novell and Linux</title> + <title>SUSE and Linux</title> <para> -Novell is committed to your success with Linux. In addition to openSUSE, -Novell also delivers an exciting suite of products designed to meet the +SUSE is committed to your success with Linux. In addition to openSUSE, +SUSE also delivers an exciting suite of products designed to meet the needs of businesses large and small.</para> <para> -The enterprise Linux products from Novell include SUSE Linux Enterprise Server, -SUSE Linux Enterprise Desktop and Novell Open Enterprise Server. Our enterprise +The enterprise Linux products from SUSE include SUSE Linux Enterprise Server and +SUSE Linux Enterprise Desktop. Our enterprise products are delivered with a seven-year maintenance guarantee and optional -support programs. For more information on enterprise Linux from Novell, visit +support programs. For more information on enterprise Linux from SUSE, visit http://www.novell.com/linux </para> -- 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] r64145 - /tags/stable-2_21_6/snapper/
by jsuchome＠svn2.opensuse.org 30 May '11

30 May '11

Author: jsuchome Date: Mon May 30 14:57:15 2011 New Revision: 64145 URL: http://svn.opensuse.org/viewcvs/yast?rev=64145&view=rev Log: Created tag stable-2_21_6 for snapper Added: tags/stable-2_21_6/snapper/ - copied from r64144, trunk/snapper/ -- 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] r64144 - in /trunk/snapper: VERSION agent-snapper/doc/snapper.html package/yast2-snapper.changes
by jsuchome＠svn2.opensuse.org 30 May '11

30 May '11

Author: jsuchome Date: Mon May 30 14:55:51 2011 New Revision: 64144 URL: http://svn.opensuse.org/viewcvs/yast?rev=64144&view=rev Log: - ask snapper library for snapshot paths - 2.21.6 Modified: trunk/snapper/VERSION trunk/snapper/agent-snapper/doc/snapper.html trunk/snapper/package/yast2-snapper.changes Modified: trunk/snapper/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/VERSION?rev=64144&r1=641… ============================================================================== --- trunk/snapper/VERSION (original) +++ trunk/snapper/VERSION Mon May 30 14:55:51 2011 @@ -1 +1 @@ -2.21.5 +2.21.6 Modified: trunk/snapper/agent-snapper/doc/snapper.html URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/agent-snapper/doc/snappe… ============================================================================== --- trunk/snapper/agent-snapper/doc/snapper.html (original) +++ trunk/snapper/agent-snapper/doc/snapper.html Mon May 30 14:55:51 2011 @@ -56,6 +56,21 @@ </td> </tr> + <tr><td><tt>.snapper.path</td><td>YCPMap</td><td align="left">YCPMap</td> + <td>Return the path to directory with given snapshot<br> + <b>Example of argument map</b>: + <pre> + $[ + "num" : 1, + $] + </pre> + <b>Example of result</b>: + <pre> + "/snapshots/1/snapshot" + </pre> + </td> + </tr> + <tr><td><tt>.snapper.snapshots</td><td>(none)</td><td align="left">YCPList</td> <td>Return list of current snapshot maps.<br> <b>Example of result</b>: Modified: trunk/snapper/package/yast2-snapper.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/package/yast2-snapper.ch… ============================================================================== --- trunk/snapper/package/yast2-snapper.changes (original) +++ trunk/snapper/package/yast2-snapper.changes Mon May 30 14:55:51 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 30 14:55:11 CEST 2011 - jsuchome(a)suse.cz + +- ask snapper library for snapshot paths +- 2.21.6 + +------------------------------------------------------------------- Wed May 11 10:41:42 CEST 2011 - jsuchome(a)suse.cz - added initialization code to agent, check for exceptions -- 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] r64143 - in /trunk/snapper: agent-snapper/src/SnapperAgent.cc src/Snapper.ycp
by jsuchome＠svn2.opensuse.org 30 May '11

30 May '11

Author: jsuchome Date: Mon May 30 14:51:39 2011 New Revision: 64143 URL: http://svn.opensuse.org/viewcvs/yast?rev=64143&view=rev Log: ask snapper library for snapshot paths Modified: trunk/snapper/agent-snapper/src/SnapperAgent.cc trunk/snapper/src/Snapper.ycp Modified: trunk/snapper/agent-snapper/src/SnapperAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/agent-snapper/src/Snappe… ============================================================================== --- trunk/snapper/agent-snapper/src/SnapperAgent.cc (original) +++ trunk/snapper/agent-snapper/src/SnapperAgent.cc Mon May 30 14:51:39 2011 @@ -148,7 +148,7 @@ if (path->length() == 1) { /** - * error: Read (.snapper.error) -> returns last error message + * Read (.snapper.error) -> returns last error message */ if (PC(0) == "error") { YCPMap retmap; @@ -156,6 +156,21 @@ return retmap; } /** + * Read (.snapper.path, $[ "num" : num]) -> returns the path to directory with given snapshot + */ + if (PC(0) == "path") { + unsigned int num = getIntValue (argmap, "num", 0); + const Snapshots& snapshots = sh->getSnapshots(); + Snapshots::const_iterator snap = snapshots.find(num); + if (snap == snapshots.end()) + { + y2error ("snapshot '%d' not found", num); + return ret; + } + return YCPString (snap->snapshotDir()); + } + + /** * Read(.snapper.snapshots) -> return list of snapshot description maps */ if (PC(0) == "snapshots") { Modified: trunk/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/src/Snapper.ycp?rev=6414… ============================================================================== --- trunk/snapper/src/Snapper.ycp (original) +++ trunk/snapper/src/Snapper.ycp Mon May 30 14:51:39 2011 @@ -43,8 +43,6 @@ // global list of all snapshot global list<map> snapshots = []; -global string snapshots_path = "/snapshots"; - global map selected_snapshot = $[]; // mapping of snapshot number to index in snapshots list @@ -70,15 +68,28 @@ } /** + * Return the path to given snapshot + */ +global string GetSnapshotPath (integer snapshot_num) { + string ret = (string) SCR::Read (.snapper.path, $[ "num" : snapshot_num ]); + if (ret == nil) + { + ret = ""; + // popup error + Report::Error (sformat (_("Snapshot '%1' was not found."), snapshot_num)); + } + return ret; +} + +/** * Describe what was done with given file between given snapshots * - when new is 0, meaning is 'current system' */ global map GetFileModification (string file, integer old, integer new) { map ret = $[]; - - string file1 = sformat ("%1/%2/snapshot%3", snapshots_path, old, file); - string file2 = sformat ("%1/%2/snapshot%3", snapshots_path, new, file); + string file1 = sformat ("%1%2", GetSnapshotPath (old), file); + string file2 = sformat ("%1%2", GetSnapshotPath (new), file); if (new == 0) file2 = file; @@ -270,7 +281,7 @@ UI::ChangeWidget (`id (`progress ), `Value, progress); - string orig = sformat ("%1/%2/snapshot", snapshots_path, snapshot_num) + file; + string orig = GetSnapshotPath (snapshot_num) + file; string dir = substring (file, 0, findlastof (file, "/")); if (!FileUtils::Exists (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] r64142 - in /trunk/online-update-configuration: package/yast2-online-update-configuration.changes src/scripts/online_update
by jdsn＠svn2.opensuse.org 30 May '11

30 May '11

Author: jdsn Date: Mon May 30 14:44:34 2011 New Revision: 64142 URL: http://svn.opensuse.org/viewcvs/yast?rev=64142&view=rev Log: fix proxy settings in automatic online update script, bnc#(678888) make online-update script more robust Modified: trunk/online-update-configuration/package/yast2-online-update-configuration.changes trunk/online-update-configuration/src/scripts/online_update Modified: trunk/online-update-configuration/package/yast2-online-update-configuration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update-configuration/pack… ============================================================================== --- trunk/online-update-configuration/package/yast2-online-update-configuration.changes (original) +++ trunk/online-update-configuration/package/yast2-online-update-configuration.changes Mon May 30 14:44:34 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 8 15:56:56 CEST 2011 - jdsn(a)suse.de + +- fix proxy settings in automatic online update script, bnc#(678888) +- make online-update script more robust + +------------------------------------------------------------------- Mon Apr 26 16:57:22 2010 - jdsn(a)suse.de - initial version, split off from yast2-registration (fate#308494) Modified: trunk/online-update-configuration/src/scripts/online_update URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update-configuration/src/… ============================================================================== --- trunk/online-update-configuration/src/scripts/online_update (original) +++ trunk/online-update-configuration/src/scripts/online_update Mon May 30 14:44:34 2011 @@ -1,5 +1,8 @@ #!/bin/bash +# source the profile to get proper proxy settings, bnc#(678888) +. /etc/profile.d/profile.sh + zyppercmd="/usr/bin/zypper" upcmd="/bin/false" syscfgfile="/etc/sysconfig/automatic_online_update" @@ -21,35 +24,27 @@ fi -if [ ! -z $AOU_ENABLE_CRONJOB ] +if [ ! "x$AOU_ENABLE_CRONJOB" = "xtrue" ] then - if [ ! $AOU_ENABLE_CRONJOB = "true" ] - then - echo "Online Update is disabled in ${syscfgfile}. Will not run update." - exit 0 - fi + echo "Online Update is disabled in ${syscfgfile}. Will not run update." + exit 0 fi -if [ ! -z $AOU_ENABLE_CRONJOB ] + +if [ "x${AOU_SKIP_INTERACTIVE_PATCHES}" = "xtrue" ] then - if [ ${AOU_SKIP_INTERACTIVE_PATCHES} = "true" ] - then - skipInteractive="--skip-interactive" - else - skipInteractive= - fi + skipInteractive="--skip-interactive" +else + skipInteractive= fi -if [ ! -z $AOU_ENABLE_CRONJOB ] +if [ "x${AOU_AUTO_AGREE_WITH_LICENSES}" = "xtrue" ] then - if [ ${AOU_AUTO_AGREE_WITH_LICENSES} = "true" ] - then - autoAgreeWithLicenses="--auto-agree-with-licenses" - else - autoAgreeWithLicenses= - fi + autoAgreeWithLicenses="--auto-agree-with-licenses" +else + autoAgreeWithLicenses= fi -- 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] r64141 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp
by gs＠svn2.opensuse.org 30 May '11

30 May '11

Author: gs Date: Mon May 30 14:14:43 2011 New Revision: 64141 URL: http://svn.opensuse.org/viewcvs/yast?rev=64141&view=rev Log: file needed for installation workflow Added: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp Added: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp Mon May 30 14:14:43 2011 @@ -0,0 +1,61 @@ +/** + * File: clients/inst_fcoe-client.ycp + * Package: Configuration of fcoe-client + * Summary: Main file + * Authors: Gabriele Mohr <gs(a)suse.de> + * + * + * File called in installation workflow for fcoe-client configuration. + */ + +{ + +/*** + * <h3>Configuration of fcoe-client</h3> + */ + +textdomain "fcoe-client"; + +/* The main () */ +y2milestone ("----------------------------------------"); +y2milestone ("FCoEClient module started"); + +import "Progress"; +import "Report"; +import "Summary"; +import "ModuleLoading"; +import "Packages"; +import "Installation"; +import "String"; +include "fcoe-client/wizards.ycp"; + +/* main ui function */ +any ret = nil; + +y2milestone("fcoe-client module started during installation"); + +// TODO: check what is needed here +// - create directories (included in open-fcoe?) +// - load any modules ? +// - start fcoemon (started in FcoeClient::ServiceStatus()) + +//SCR::Execute(.target.bash, "mkdir -p /etc/iscsi; touch /etc/iscsi/initiatorname.iscsi; ln -s /etc/iscsi/initiatorname.iscsi /etc/initiatorname.iscsi"); +// ModuleLoading::Load("iscsi_tcp", "", "", "", false, true); +// start iscsid daemon +// IscsiClientLib::startIScsid(); +// IscsiClientLib::autoLogOn(); + +// run dialog +ret = MainSequence(); +y2debug("MainSequence ret=%1", ret); +// add package open-iscsi to installed system +Packages::addAdditionalPackage("open-fcoe"); + +/* Finish */ +y2milestone("fcoe-client module finished"); +y2milestone("----------------------------------------"); + +return ret; + +/* 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] r64140 - /trunk/fcoe-client/src/inst_fcoe-client.ycp
by gs＠svn2.opensuse.org 30 May '11

30 May '11

Author: gs Date: Mon May 30 14:13:55 2011 New Revision: 64140 URL: http://svn.opensuse.org/viewcvs/yast?rev=64140&view=rev Log: file needed for installation workflow Added: trunk/fcoe-client/src/inst_fcoe-client.ycp Added: trunk/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/inst_fcoe-client… ============================================================================== --- trunk/fcoe-client/src/inst_fcoe-client.ycp (added) +++ trunk/fcoe-client/src/inst_fcoe-client.ycp Mon May 30 14:13:55 2011 @@ -0,0 +1,61 @@ +/** + * File: clients/inst_fcoe-client.ycp + * Package: Configuration of fcoe-client + * Summary: Main file + * Authors: Gabriele Mohr <gs(a)suse.de> + * + * + * File called in installation workflow for fcoe-client configuration. + */ + +{ + +/*** + * <h3>Configuration of fcoe-client</h3> + */ + +textdomain "fcoe-client"; + +/* The main () */ +y2milestone ("----------------------------------------"); +y2milestone ("FCoEClient module started"); + +import "Progress"; +import "Report"; +import "Summary"; +import "ModuleLoading"; +import "Packages"; +import "Installation"; +import "String"; +include "fcoe-client/wizards.ycp"; + +/* main ui function */ +any ret = nil; + +y2milestone("fcoe-client module started during installation"); + +// TODO: check what is needed here +// - create directories (included in open-fcoe?) +// - load any modules ? +// - start fcoemon (started in FcoeClient::ServiceStatus()) + +//SCR::Execute(.target.bash, "mkdir -p /etc/iscsi; touch /etc/iscsi/initiatorname.iscsi; ln -s /etc/iscsi/initiatorname.iscsi /etc/initiatorname.iscsi"); +// ModuleLoading::Load("iscsi_tcp", "", "", "", false, true); +// start iscsid daemon +// IscsiClientLib::startIScsid(); +// IscsiClientLib::autoLogOn(); + +// run dialog +ret = MainSequence(); +y2debug("MainSequence ret=%1", ret); +// add package open-iscsi to installed system +Packages::addAdditionalPackage("open-fcoe"); + +/* Finish */ +y2milestone("fcoe-client module finished"); +y2milestone("----------------------------------------"); + +return ret; + +/* 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] r64139 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/yast2-fcoe-client.spec.in
by gs＠svn2.opensuse.org 30 May '11

30 May '11

Author: gs Date: Mon May 30 14:12:47 2011 New Revision: 64139 URL: http://svn.opensuse.org/viewcvs/yast?rev=64139&view=rev Log: inst_fcoe-client.ycp added Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/yast2-fcoe-client.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/yast2-fcoe-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/yast2-fcoe-client.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/yast2-fcoe-client.spec.in Mon May 30 14:12:47 2011 @@ -25,6 +25,7 @@ @yncludedir@/fcoe-client/* @clientdir@/fcoe-client.ycp @clientdir@/fcoe-client_*.ycp +@clientdir@/inst_fcoe-client.ycp @moduledir@/FcoeClient.* @desktopdir@/fcoe-client.desktop %dir @scrconfdir@ -- 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] r64138 - /trunk/fcoe-client/yast2-fcoe-client.spec.in
by gs＠svn2.opensuse.org 30 May '11

30 May '11

Author: gs Date: Mon May 30 14:11:24 2011 New Revision: 64138 URL: http://svn.opensuse.org/viewcvs/yast?rev=64138&view=rev Log: inst_fcoe-client.ycp added Modified: trunk/fcoe-client/yast2-fcoe-client.spec.in Modified: trunk/fcoe-client/yast2-fcoe-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/yast2-fcoe-client.sp… ============================================================================== --- trunk/fcoe-client/yast2-fcoe-client.spec.in (original) +++ trunk/fcoe-client/yast2-fcoe-client.spec.in Mon May 30 14:11:24 2011 @@ -26,6 +26,7 @@ @yncludedir@/fcoe-client/* @clientdir@/fcoe-client.ycp @clientdir@/fcoe-client_*.ycp +@clientdir@/inst_fcoe-client.ycp @moduledir@/FcoeClient.* @desktopdir@/fcoe-client.desktop %dir @scrconfdir@ -- 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] r64137 - /tags/branch-Code-11-SP2-2_17_104/storage/
by fehr＠svn2.opensuse.org 30 May '11

30 May '11

Author: fehr Date: Mon May 30 14:03:08 2011 New Revision: 64137 URL: http://svn.opensuse.org/viewcvs/yast?rev=64137&view=rev Log: Created tag branch-Code-11-SP2-2_17_104 for storage Added: tags/branch-Code-11-SP2-2_17_104/storage/ (props changed) - copied from r64136, branches/SuSE-Code-11-SP2-Branch/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] r64136 - /tags/branch-Code-11-SP2-2_17_104/
by fehr＠svn2.opensuse.org 30 May '11

30 May '11

Author: fehr Date: Mon May 30 14:03:04 2011 New Revision: 64136 URL: http://svn.opensuse.org/viewcvs/yast?rev=64136&view=rev Log: Created tag branch-Code-11-SP2-2_17_104 Added: tags/branch-Code-11-SP2-2_17_104/ -- 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] r64135 - in /branches/SuSE-Code-11-SP2-Branch/storage: VERSION package/yast2-storage.changes yast2-storage.spec.in
by fehr＠svn2.opensuse.org 30 May '11

30 May '11

Author: fehr Date: Mon May 30 14:02:55 2011 New Revision: 64135 URL: http://svn.opensuse.org/viewcvs/yast?rev=64135&view=rev Log: - testsuite is BuildRequires not Requires - version 2.17.104 Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/yast2-storage.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/VERSION Mon May 30 14:02:55 2011 @@ -1 +1 @@ -2.17.103 +2.17.104 Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Mon May 30 14:02:55 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 30 14:01:57 CEST 2011 - fehr(a)suse.de + +- testsuite is BuildRequires not Requires +- version 2.17.104 + +------------------------------------------------------------------- Thu May 26 16:07:46 CEST 2011 - fehr(a)suse.de - backport patch to support also parted 2.4 Modified: branches/SuSE-Code-11-SP2-Branch/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/yast2-storage.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/yast2-storage.spec.in Mon May 30 14:02:55 2011 @@ -3,9 +3,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 libxml2-devel +BuildRequires: yast2-testsuite >= 2.17.0 Requires: yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid multipath-tools Requires: kpartx cryptsetup util-linux >= 2.16 lsscsi -Requires: yast2-testsuite >= 2.17.0 Requires: yast2-core >= 2.17.38 Requires: yast2 >= 2.17.94 Requires: yast2-libyui >= 2.17.5 -- 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] r64134 - /trunk/installation/control/control.openSUSE.xml
by coolo＠svn2.opensuse.org 30 May '11

30 May '11

Author: coolo Date: Mon May 30 13:24:56 2011 New Revision: 64134 URL: http://svn.opensuse.org/viewcvs/yast?rev=64134&view=rev Log: lnussel: change write_hostname_to_hosts to false (fate#308824) Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon May 30 13:24:56 2011 @@ -16,7 +16,7 @@ <firewall_enable_ssh config:type="boolean">false</firewall_enable_ssh>  - <write_hostname_to_hosts config:type="boolean">true</write_hostname_to_hosts> + <write_hostname_to_hosts config:type="boolean">false</write_hostname_to_hosts>  <run_init_scripts_in_parallel config:type="boolean">true</run_init_scripts_in_parallel> -- 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] r64133 - /trunk/installation/control/control.openSUSE.xml
by coolo＠svn2.opensuse.org 30 May '11

30 May '11

Author: coolo Date: Mon May 30 13:22:47 2011 New Revision: 64133 URL: http://svn.opensuse.org/viewcvs/yast?rev=64133&view=rev Log: it's 12.1 now Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon May 30 13:22:47 2011 @@ -198,9 +198,9 @@ <extra_urls config:type="list">  <extra_url> - <baseurl>http://download.opensuse.org/update/11.4/</baseurl> + <baseurl>http://download.opensuse.org/update/12.1/</baseurl> <alias>repo-update</alias> - <name>openSUSE-11.4-Update</name> + <name>openSUSE-12.1-Update</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> @@ -209,36 +209,36 @@  <extra_url> - <baseurl>http://download.opensuse.org/distribution/11.4/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/distribution/12.1/repo/oss/</baseurl> <alias>repo-oss</alias> - <name>openSUSE-11.4-Oss</name> + <name>openSUSE-12.1-Oss</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/distribution/11.4/repo/non-oss/</baseurl> + <baseurl>http://download.opensuse.org/distribution/12.1/repo/non-oss/</baseurl> <alias>repo-non-oss</alias> - <name>openSUSE-11.4-Non-Oss</name> + <name>openSUSE-12.1-Non-Oss</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/debug/distribution/11.4/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/debug/distribution/12.1/repo/oss/</baseurl> <alias>repo-debug</alias> - <name>openSUSE-11.4-Debug</name> + <name>openSUSE-12.1-Debug</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/debug/update/11.4/</baseurl> + <baseurl>http://download.opensuse.org/debug/update/12.1/</baseurl> <alias>repo-debug-update</alias> - <name>openSUSE-11.4-Update-Debug</name> + <name>openSUSE-12.1-Update-Debug</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> @@ -246,9 +246,9 @@ </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/source/distribution/11.4/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/source/distribution/12.1/repo/oss/</baseurl> <alias>repo-source</alias> - <name>openSUSE-11.4-Source</name> + <name>openSUSE-12.1-Source</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> -- 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] r64132 - /trunk/fcoe-client/src/complex.ycp
by gs＠svn2.opensuse.org 30 May '11

30 May '11

Author: gs Date: Mon May 30 12:51:46 2011 New Revision: 64132 URL: http://svn.opensuse.org/viewcvs/yast?rev=64132&view=rev Log: check for /etc/sysconfig/network/ifcfg-<interface>, improve handling in installed system Modified: trunk/fcoe-client/src/complex.ycp Modified: trunk/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/complex.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/complex.ycp (original) +++ trunk/fcoe-client/src/complex.ycp Mon May 30 12:51:46 2011 @@ -38,7 +38,7 @@ import "FcoeClient"; import "Service"; import "Stage"; - +import "FileUtils"; include "fcoe-client/helps.ycp"; include "fcoe-client/dialogs.ycp"; @@ -251,15 +251,20 @@ { map card = FcoeClient::GetCurrentNetworkCard(); string dev_name = card["dev_name"]:""; + string command = ""; map output = $[]; string vlan_interface = ""; string fcoe_vlan_interface = ""; map status_map = $[]; - + boolean create_ifcfg = false; + string ifcfg_file = ""; + if ( Stage::initial() ) // first stage - create and start FCoE VLAN interface - { + { + // headline of a popup: creating and starting Fibre Channel over Ethernet boolean ret = Popup::YesNoHeadline( _("Creating and starting FCoE on detected VLAN device"), + // question to the user: really create and start FCoE sformat( _("Do you really want to create a FCoE network interface for discovered FCoE VLAN interface on %1 and start the FCoE initiator?"), dev_name ) ); @@ -274,6 +279,7 @@ if ( output["exit"]:255 != 0 ) { + // text of an error popup Popup::Error( sformat( _("Cannot create and start FCoE on %1"), dev_name ) ); return nil; } @@ -286,27 +292,39 @@ } else // installed system - if VLAN already exists only start FCoE { + // headline of a popup: starting Fibre Channel over Ethernet boolean ret = Popup::YesNoHeadline( _("Starting FCoE on detected VLAN device"), + // question to the user: really start FCoE sformat( _("Do you really want to start FCoE initiator on discovered FCoE VLAN interface on %1?"), dev_name ) ); if ( ret == true ) { - // call 'ifup' for vlan interface - creates /proc/net/vlan/<vlan-interface> + ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1\.%2", dev_name, card["vlan_interface"]:"" ); + // if /etc/sysconfig/network/ifcfg-<vlan-interface> already exists - command = sformat( "ifup %1\.%2", dev_name, card["vlan_interface"]:"" ); - y2milestone( "Executing command: %1", command ); - output = (map)SCR::Execute( .target.bash_output, command ); - y2milestone( "Output: %1", output ); + // call 'ifup' for the interface (creates /proc/net/vlan/<vlan-interface>) + if ( FileUtils::Exists( ifcfg_file ) ) + { + command = sformat( "ifup %1\.%2", dev_name, card["vlan_interface"]:"" ); + y2milestone( "Executing command: %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); - if ( output["exit"]:255 == 0 ) - { - // start FCoE - command = sformat( "fipvlan -s %1", dev_name ); + if ( output["exit"]:255 == 0 ) + { + // start FCoE + command = sformat( "fipvlan -s %1", dev_name ); + } + else + { + command = sformat( "fipvlan -c -s %1", dev_name ); // create and start FCoE + create_ifcfg = true; + } } else { - // create and start FCoE command = sformat( "fipvlan -c -s %1", dev_name ); + create_ifcfg = true; } y2milestone( "Executing command: %1", command ); @@ -314,6 +332,7 @@ y2milestone( "Output: %1", output ); if ( output["exit"]:255 != 0 ) { + // text of an error popup: command failed on the network interface Popup::Error( sformat( _("Command \"%1\" on %2 failed."), command, dev_name ) ); return nil; } @@ -340,11 +359,18 @@ y2milestone( "FCoE VLAN interface %1 created/started", fcoe_vlan_interface ); status_map = FcoeClient::GetFCoEStatus( fcoe_vlan_interface ); - // store command to be able to redo the creation of FCoE VLAN interface - // in case of abort - TODO: is this also OK if only 'fipvlan -s <interface>' is called? + // store command to be able to redo the creation of FCoE VLAN interface in case of abort + // TODO: is this also OK if only 'fipvlan -s <interface>' is called? FcoeClient::AddRedoCommand( sformat("vconfig rem %1", fcoe_vlan_interface ) ); - card["modified"] = "yes"; - FcoeClient::SetModified( true ); + if ( create_ifcfg ) + { + string config = sformat( "BOOTPROTO=\"static\"\nSTARTMODE=\"onboot\" +ETHERDEVICE=\"%1\"\nUSERCONTROL=\"no\"\nINTERFACETYPE=\"vlan\"\n", dev_name ); + ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1", fcoe_vlan_interface ); + SCR::Write(.target.string, ifcfg_file, config); + y2milestone( "Writing config: %1 to %2", config, ifcfg_file ); + FcoeClient::AddRedoCommand( sformat( "rm %1", ifcfg_file ) ); + } } else { @@ -357,7 +383,9 @@ card["fcoe_enable"] = status_map["FCOE_ENABLE"]:""; card["dcb_required"] = status_map["DCB_REQUIRED"]:""; card["cfg_file"] = status_map["Filename"]:""; - + card["modified"] = "yes"; + FcoeClient::SetModified( true ); + FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0