May 2011 - YaST Commits - openSUSE Mailing Lists

[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