October 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66577 - /tags/branch-Code-11-SP2-2_17_118/
by fehr＠svn2.opensuse.org 25 Oct '11

25 Oct '11

Author: fehr Date: Tue Oct 25 16:18:47 2011 New Revision: 66577 URL: http://svn.opensuse.org/viewcvs/yast?rev=66577&view=rev Log: Created tag branch-Code-11-SP2-2_17_118 Added: tags/branch-Code-11-SP2-2_17_118/ -- 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] r66576 - in /branches/SuSE-Code-11-SP2-Branch/storage: ./ libstorage/src/ package/ storage/src/modules/
by fehr＠svn2.opensuse.org 25 Oct '11

25 Oct '11

Author: fehr Date: Tue Oct 25 16:18:35 2011 New Revision: 66576 URL: http://svn.opensuse.org/viewcvs/yast?rev=66576&view=rev Log: - version 2.17.118 - add function IsDeviceOnNetwork to be used by Network module (bnc#726057) Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageInterface.h branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp 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 Tue Oct 25 16:18:35 2011 @@ -1 +1 @@ -2.17.117 +2.17.118 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 Oct 25 16:18:35 2011 @@ -5090,11 +5090,21 @@ if (findVolume(device, c, v)) { ret = 0; + if( c->type()==BTRFSC ) + { + const Btrfs * b = dynamic_cast<const Btrfs *>(&(*v)); + if( b!=NULL && b->getDevices().size()==1 ) + { + findVolume(b->device(), c, v, true); + } + } info.ctype = c->type(); info.cname = c->name(); info.cdevice = c->device(); info.vname = v->name(); info.vdevice = v->device(); + if( v->isNumeric() ) + info.num = v->nr(); } else if (findContainer(device, c)) { @@ -5723,11 +5733,11 @@ } bool Storage::findVolume( const string& device, ConstContIterator& c, - ConstVolIterator& v ) + ConstVolIterator& v, bool no_btrfs ) { ContIterator ct; VolIterator vt; - bool ret = findVolume( device, ct, vt ); + bool ret = findVolume( device, ct, vt, no_btrfs ); if( ret ) { c = ct; Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h Tue Oct 25 16:18:35 2011 @@ -2051,7 +2051,7 @@ bool findVolume( const string& device, ContIterator& c, VolIterator& v, bool no_btrfs=false ); bool findVolume( const string& device, ConstContIterator& c, - ConstVolIterator& v ); + ConstVolIterator& v, bool no_btrfs=false ); bool findVolume( const string& device, VolIterator& v, bool also_del=false, bool no_btrfs=false ); bool findVolume( const string& device, ConstVolIterator& v, 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 Oct 25 16:18:35 2011 @@ -601,12 +601,13 @@ */ struct ContVolInfo { - ContVolInfo() : ctype(CUNKNOWN) {} + ContVolInfo() : ctype(CUNKNOWN), num(-1) {} CType ctype; string cname; string cdevice; string vname; string vdevice; + int num; }; /** 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 Oct 25 16:18:35 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 25 16:08:52 CEST 2011 - fehr(a)suse.de + +- version 2.17.118 +- add function IsDeviceOnNetwork to be used by Network module + (bnc#726057) + +------------------------------------------------------------------- Mon Oct 24 14:11:58 CEST 2011 - fehr(a)suse.de - version 2.17.117 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 Tue Oct 25 16:18:35 2011 @@ -510,6 +510,40 @@ return LibStorage::StorageInterface::getIgnoreFstab(sint, device, val) == 0; } +symbol toSymbol( map<string,any> conv, integer val ) + { + return( conv["m",val]:(conv["def_sym"]:`invalid_conv_map) ); + } + +integer fromSymbol( map<string,any> conv, symbol val ) + { + integer ret = conv["def_int"]:-1; + foreach( integer i, symbol s, conv["m"]:$[], + ``{ + if( s==val ) + ret = i; + }); + return( ret ); + } + +global boolean GetContVolInfo(string device, map<string, any>& info) + { + any tmp = LibStorage::ContVolInfo::new("LibStorage::ContVolInfo"); + if (LibStorage::StorageInterface::getContVolInfo(sint, device, tmp) != 0) + return false; + + info = $[ "ctype" : toSymbol(conv_ctype, LibStorage::ContVolInfo::swig_ctype_get(tmp)), + "cname" : LibStorage::ContVolInfo::swig_cname_get(tmp), + "cdevice" : LibStorage::ContVolInfo::swig_cdevice_get(tmp), + "vname" : LibStorage::ContVolInfo::swig_vname_get(tmp), + "vdevice" : LibStorage::ContVolInfo::swig_vdevice_get(tmp), + "num" : LibStorage::ContVolInfo::swig_num_get(tmp) ]; + + y2milestone("GetContVolInfo device:%1 info:%2", device, info); + return true; + } + + global define map<string,map> GetTargetMap(); global define void SetTargetMap( map<string,map> target ); @@ -519,8 +553,9 @@ string key ); -define list<map> GetDiskPartitionTg( string device, map<string,map> tg ) +define list<map> GetDiskPartitionTg( string inpdev, map<string,map> tg ) ``{ + string device = inpdev; list<map> ret = []; integer dlen = 0; boolean as_string = false; @@ -740,6 +775,23 @@ { tmp["nr"] = ""; } + if( size(tg)>0 && !haskey( tg, tmp["disk"]:"" )) + { + y2milestone( "GetDiskPartitionTg tmp:%1", tmp ); + map<string,any> r = $[]; + if( GetContVolInfo( inpdev, r )) + { + y2milestone( "GetDiskPartitionTg rtmp:%1", r ); + if( haskey( tg, r["cdevice"]:"" )) + { + tmp["disk"] = r["cdevice"]:""; + if( r["num"]:-1 != -1 ) + tmp["nr"] = r["num"]:-1; + else + tmp["nr"] = r["vname"]:""; + } + } + } ret = [ tmp ]; } else @@ -1188,22 +1240,6 @@ return( ret ); } -symbol toSymbol( map<string,any> conv, integer val ) - { - return( conv["m",val]:(conv["def_sym"]:`invalid_conv_map) ); - } - -integer fromSymbol( map<string,any> conv, symbol val ) - { - integer ret = conv["def_int"]:-1; - foreach( integer i, symbol s, conv["m"]:$[], - ``{ - if( s==val ) - ret = i; - }); - return( ret ); - } - global define boolean CheckBackupState( string who ) { y2milestone( "CheckBackupStates who:%1", who ); @@ -1849,7 +1885,7 @@ } else { - if( haskey( mp, k )); + if( haskey( mp, k )) { y2milestone( "HandleBtrfsSimpleVolumes remove key %1", k ); tg = DelPartitionData( tg, p["device"]:"", k ); @@ -2227,23 +2263,6 @@ } - global boolean GetContVolInfo(string device, map<string, any>& info) - { - any tmp = LibStorage::ContVolInfo::new("LibStorage::ContVolInfo"); - if (LibStorage::StorageInterface::getContVolInfo(sint, device, tmp) != 0) - return false; - - info = $[ "ctype" : toSymbol(conv_ctype, LibStorage::ContVolInfo::swig_ctype_get(tmp)), - "cname" : LibStorage::ContVolInfo::swig_cname_get(tmp), - "cdevice" : LibStorage::ContVolInfo::swig_cdevice_get(tmp), - "vname" : LibStorage::ContVolInfo::swig_vname_get(tmp), - "vdevice" : LibStorage::ContVolInfo::swig_vdevice_get(tmp) ]; - - y2milestone("GetContVolInfo device:%1 info:%2", device, info); - return true; - } - - global boolean IsInstallationSource(string device) { if (part_insts == nil) @@ -6082,4 +6101,88 @@ include "./storage_update.ycp"; +list<string> GetUsedDisks( string device ) + { + y2milestone( "GetUsedDisks device:%1", device ); + list<string> ret = []; + map<string,map> tg = GetTargetMap(); + map<string,any> info = $[]; + if( GetContVolInfo(device, info)) + { + y2milestone( "GetUsedDisks info:%1", info ); + list<string> to_visit = [ device ]; + list<string> visited_devs = []; + do + { + visited_devs = add( visited_devs, to_visit[0]:"" ); + to_visit = remove( to_visit, 0 ); + list<string> add_list = []; + if( info["ctype"]:`CT_UNKNOWN==`CT_DISK ) + { + if( !contains( ret, info["cdevice"]:"" )) + ret = add( ret, info["cdevice"]:"" ); + } + else if( info["ctype"]:`CT_UNKNOWN==`CT_BTRFS ) + { + map bt = find( map p, tg["/dev/btrfs","partitions"]:[], + ``(contains( p["devices"]:[], info["vdevice"]:"" ))); + y2milestone( "GetUsedDisks bt:%1", bt ); + if( bt!=nil ) + add_list = bt["devices"]:[]; + } + else + { + add_list = tg[info["cdevice"]:"","devices"]:[]; + } + if( size(add_list)>0 ) + y2milestone( "GetUsedDisks add_list:%1", add_list ); + foreach( string s, add_list, + ``{ + if( !contains( visited_devs, s ) && !contains( to_visit, s ) && + !contains( ret, s )) + to_visit = add( to_visit, s ); + }); + y2milestone( "GetUsedDisks to_visit:%1", to_visit ); + while( size(to_visit)>0 && !GetContVolInfo(to_visit[0]:"", info)) + { + visited_devs = add( visited_devs, to_visit[0]:"" ); + to_visit = remove( to_visit, 0 ); + } + if( size(to_visit)>0 ) + y2milestone( "GetUsedDisks info:%1", info ); + } + while( size(to_visit)>0 ); + if( size(ret)>1 ) + ret = sort( ret ); + } + else if( substring(device,0,1)!="/" && search(device,":")>0 ) + ret = [ "/dev/nfs" ]; + y2milestone( "GetUsedDisks ret:%1", ret ); + return( ret ); + } + +global symbol IsDeviceOnNetwork( string device ) + { + symbol ret = `no; + map<string,map> tg = GetTargetMap(); + + list<string> disks = GetUsedDisks( device ); + if( disks[0]:""=="/dev/nfs" ) + ret = `nfs; + else + { + foreach( string s, disks, + ``{ + if( ret == `no ) + { + y2milestone( "disk:%1 tarnsport:%2", s, tg[s,"transport"]:`unknown ); + if( contains( [ `fcoe, `iscsi ], tg[s,"transport"]:`unknown )) + ret = tg[s,"transport"]:`unknown; + } + }); + } + y2milestone( "IsDeviceOnNetwork device:%1 ret:%2", device, ret ); + 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] r66575 - in /trunk/yast2: library/types/src/String.ycp library/types/testsuite/tests/String.out library/types/testsuite/tests/String.ycp package/yast2.changes
by locilka＠svn2.opensuse.org 25 Oct '11

25 Oct '11

Author: locilka Date: Tue Oct 25 15:49:47 2011 New Revision: 66575 URL: http://svn.opensuse.org/viewcvs/yast?rev=66575&view=rev Log: - Added new function String::ReplaceWith that is a replacement for often used mergestring(splitstring(...)) ... with testcase Modified: trunk/yast2/library/types/src/String.ycp trunk/yast2/library/types/testsuite/tests/String.out trunk/yast2/library/types/testsuite/tests/String.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/types/src/String.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/src/String.y… ============================================================================== --- trunk/yast2/library/types/src/String.ycp (original) +++ trunk/yast2/library/types/src/String.ycp Tue Oct 25 15:49:47 2011 @@ -1354,5 +1354,21 @@ return dir; } +/** + * Replaces all characters in a given string with some other string or character + * + * @param (string) input string + * @param (string) all characters to replace + * @param (string) replace with + * @param (string) string with replaced characters + * + * @example + * // Replace whitespace characters with dashes + * ReplaceWith ("a\nb\tc d", "\n\t ", "-") -> "a-b-c-d" + */ +global string ReplaceWith (string str, string chars, string glue) { + return mergestring (splitstring (str, chars), glue); +} + /* EOF */ } Modified: trunk/yast2/library/types/testsuite/tests/String.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/te… ============================================================================== --- trunk/yast2/library/types/testsuite/tests/String.out (original) +++ trunk/yast2/library/types/testsuite/tests/String.out Tue Oct 25 15:49:47 2011 @@ -134,3 +134,6 @@ Return &&&&Hello Return &&&&Hello Return &&Hello +Dump String::ReplaceWith +Return a-b-c-d +Return this is an input text containing some special characters to remove Modified: trunk/yast2/library/types/testsuite/tests/String.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/te… ============================================================================== --- trunk/yast2/library/types/testsuite/tests/String.ycp (original) +++ trunk/yast2/library/types/testsuite/tests/String.ycp Tue Oct 25 15:49:47 2011 @@ -174,4 +174,8 @@ TEST(``(String::RemoveShortcut("&&&&Hello")), [], nil); TEST(``(String::RemoveShortcut("&&&&&Hello")), [], nil); TEST(``(String::RemoveShortcut("&&He&llo")), [], nil); + +DUMP("String::ReplaceWith"); +TEST(``(String::ReplaceWith ("a\nb\tc d", "\n\t ", "-")), [], nil); +TEST(``(String::ReplaceWith ("this$# is an in&put text co@ntain$ing some special## ch@a$racters to remove", "&$#@", "")), [], nil); } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Oct 25 15:49:47 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 25 15:45:33 CEST 2011 - locilka(a)suse.cz + +- Added new function String::ReplaceWith that is a replacement for + often used mergestring(splitstring(...)) + +------------------------------------------------------------------- Thu Oct 20 11:54:34 CEST 2011 - locilka(a)suse.cz - Fixed script for generating translations for firewall services -- 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] r66574 - in /branches/SuSE-Code-11-SP2-Branch: network/package/ network/src/modules/ network/testsuite/tests/ yast2/ yast2/library/network/src/ yast2/library/network/testsuite/tests/ yast2/package/
by mvidner＠svn2.opensuse.org 25 Oct '11

25 Oct '11

Author: mvidner Date: Tue Oct 25 15:40:35 2011 New Revision: 66574 URL: http://svn.opensuse.org/viewcvs/yast?rev=66574&view=rev Log: Moved NetworkStorage from yast2.rpm to yast2-network.rpm (bnc#726057) to prepare for making it depend on yast2-storage y2n is its only user. Apparently it was here for the installation, back when y2n was not all in the inst-sys. Added: branches/SuSE-Code-11-SP2-Branch/network/src/modules/NetworkStorage.ycp - copied unchanged from r66573, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/NetworkStorage.ycp branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/NetworkStorage.err - copied unchanged from r66573, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkStorage.err branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/NetworkStorage.out - copied unchanged from r66573, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkStorage.out branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/NetworkStorage.ycp - copied unchanged from r66573, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkStorage.ycp Removed: branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/NetworkStorage.ycp branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkStorage.err branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkStorage.out branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkStorage.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/yast2/VERSION branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes Tue Oct 25 15:40:35 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 25 15:36:34 CEST 2011 - mvidner(a)suse.cz + +- Moved NetworkStorage from yast2.rpm to yast2-network.rpm + (bnc#726057) + +------------------------------------------------------------------- Fri Sep 2 16:08:07 CEST 2011 - mvidner(a)suse.cz - Don't switch bonding interfaces to DHCP when editing them (bnc#711962). Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/VERSION Tue Oct 25 15:40:35 2011 @@ -1 +1 @@ -2.17.113 +2.17.114 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Tue Oct 25 15:40:35 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 25 15:36:34 CEST 2011 - mvidner(a)suse.cz + +- Moved NetworkStorage from yast2.rpm to yast2-network.rpm + (bnc#726057) +- 2.17.114 + +------------------------------------------------------------------- Thu Oct 20 11:54:34 CEST 2011 - locilka(a)suse.cz - Fixed script for generating translations for firewall services -- 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] r66573 - in /branches/tmp/ke/autoinstallation/doc/xml: CreateProfile.xml GeneralSection.xml Installation.xml Profile.xml RulesAndClasses.xml autoyast.xml
by keichwa＠svn2.opensuse.org 25 Oct '11

25 Oct '11

Author: keichwa Date: Tue Oct 25 15:10:30 2011 New Revision: 66573 URL: http://svn.opensuse.org/viewcvs/yast?rev=66573&view=rev Log: novdoc adjustments Modified: branches/tmp/ke/autoinstallation/doc/xml/CreateProfile.xml branches/tmp/ke/autoinstallation/doc/xml/GeneralSection.xml branches/tmp/ke/autoinstallation/doc/xml/Installation.xml branches/tmp/ke/autoinstallation/doc/xml/Profile.xml branches/tmp/ke/autoinstallation/doc/xml/RulesAndClasses.xml branches/tmp/ke/autoinstallation/doc/xml/autoyast.xml Modified: branches/tmp/ke/autoinstallation/doc/xml/CreateProfile.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x… ============================================================================== --- branches/tmp/ke/autoinstallation/doc/xml/CreateProfile.xml (original) +++ branches/tmp/ke/autoinstallation/doc/xml/CreateProfile.xml Tue Oct 25 15:10:30 2011 @@ -1,7 +1,8 @@ <chapter id="CreateProfile"> <title >Creating A Control File</title> - + <para> + </para> <section id="Autoinstallation.collectInfo"> <title>Collect information</title> <para> @@ -133,24 +134,28 @@ </example> <para> As you can see, this file expects the "hostname" and the "domain" as parameters from the user. + </para> <screen><xsl:param name="hostname"/> <xsl:param name="domain"/></screen> - There will be a "copy" of those parameters in the "dns" section of the control file. That means, - if there already is a domain element in the dns section, you'll get a second one (no good). - </para> + <para>There will be a "copy" of those parameters in the "dns" section of the control file. That means, + if there already is a domain element in the dns section, you'll get a second one (no good).</para> <para> If you want to create a new autoyast profile now from the template plus the XSL file, run the following command: + </para> <screen>sabcmd add_hostname.xsl \$hostname=myHost \$domain=my.domain template.xml</screen> + <para> You'll get a filled out autoyast profile then on STDOUT. </para> <para> - If you have multiple XSL files you want to apply to a template, do it like this + If you have multiple XSL files you want to apply to a template, do it like this: + </para> <screen> sabcmd add_hd_vg.xsl \$device=/dev/sda \$partition=p2 \$vg=system \ | sabcmd add_harddisk.xsl \$device=/dev/system \$lvm=true \ | sabcmd .... | sabcmd add_hostname.xsl \$hostname=myHost \$domain=my.domain </screen> + <para> So you just pipe the output of each sabcmd to the next sabcmd. </para> <para> Modified: branches/tmp/ke/autoinstallation/doc/xml/GeneralSection.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x… ============================================================================== --- branches/tmp/ke/autoinstallation/doc/xml/GeneralSection.xml (original) +++ branches/tmp/ke/autoinstallation/doc/xml/GeneralSection.xml Tue Oct 25 15:10:30 2011 @@ -59,7 +59,7 @@ reason. true will reboot, false will not reboot and a missing <emphasis>forceboot</emphasis> option uses the products default. </para> - + <screen><xi:include href="examples/example.generalOptions.xml" parse="text" Modified: branches/tmp/ke/autoinstallation/doc/xml/Installation.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x… ============================================================================== --- branches/tmp/ke/autoinstallation/doc/xml/Installation.xml (original) +++ branches/tmp/ke/autoinstallation/doc/xml/Installation.xml Tue Oct 25 15:10:30 2011 @@ -1,6 +1,8 @@ <chapter id="Invoking"> <title>The Auto-Installation Process</title> + <para> + </para> <section id="Installation.process"> <title> Modified: branches/tmp/ke/autoinstallation/doc/xml/Profile.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x… ============================================================================== --- branches/tmp/ke/autoinstallation/doc/xml/Profile.xml (original) +++ branches/tmp/ke/autoinstallation/doc/xml/Profile.xml Tue Oct 25 15:10:30 2011 @@ -1,7 +1,8 @@ <chapter id="Profile"> <title>The Control File</title> - + <para> + </para> <section id="Profile.Intro"> <title> Introduction @@ -227,15 +228,12 @@ <para> Global profile attributes are used to define meta-data on resources and properties. Attributes are used to define context switching. They are also used for naming and - typing properties as shown in earlier sectionons - <footnote> - <para> + typing properties as shown in earlier sectionons. + Profile attributes are in a separate namespace so they don't have to be treated as reserved words in the default namespace. New ones can then be added without having to potentially alter existing profiles. - </para> - </footnote>. </para> <para> Profile attributes are defined in the configuration namespace and must @@ -276,10 +274,10 @@ </para> <para> Verfify your autoyast XML file + </para> <screen> /usr/bin/xmllint --noout --relaxng /usr/share/YaST2/schema/autoyast/rng/profile.rng myAutoYaSTProfile.xml </screen> - </para> </section> </section> Modified: branches/tmp/ke/autoinstallation/doc/xml/RulesAndClasses.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x… ============================================================================== --- branches/tmp/ke/autoinstallation/doc/xml/RulesAndClasses.xml (original) +++ branches/tmp/ke/autoinstallation/doc/xml/RulesAndClasses.xml Tue Oct 25 15:10:30 2011 @@ -1,6 +1,8 @@ <chapter id="rulesandclass"> <title>Rules and Classes</title> + <para> + </para> <section id="rules"> <title>Rule based auto-installation</title> <para> Modified: branches/tmp/ke/autoinstallation/doc/xml/autoyast.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x… ============================================================================== --- branches/tmp/ke/autoinstallation/doc/xml/autoyast.xml (original) +++ branches/tmp/ke/autoinstallation/doc/xml/autoyast.xml Tue Oct 25 15:10:30 2011 @@ -41,33 +41,45 @@ ]> <book lang="en"> + <bookinfo> <title>AutoYaST</title> +  + <legalnotice> + <para> +  + </para> + </legalnotice> <authorgroup> <author> <firstname>Anas</firstname> <surname>Nashif</surname> +  </author> <author> <firstname>Uwe</firstname> <surname>Gansert</surname> +  </author> </authorgroup> - <corpauthor>SUSE Linux Products GmbH</corpauthor> - <copyright> - <year>2004</year> - <holder> &company-suse; Linux AG</holder> - </copyright> </bookinfo> &Introduction; -- 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] r66572 - /tags/stable-2_21_2/ncurses-pkg/
by gs＠svn2.opensuse.org 25 Oct '11

25 Oct '11

Author: gs Date: Tue Oct 25 14:36:42 2011 New Revision: 66572 URL: http://svn.opensuse.org/viewcvs/yast?rev=66572&view=rev Log: Created tag stable-2_21_2 for ncurses-pkg Added: tags/stable-2_21_2/ncurses-pkg/ - copied from r66571, trunk/ncurses-pkg/ -- 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] r66571 - in /trunk/ncurses-pkg: VERSION package/yast2-ncurses-pkg.changes
by gs＠svn2.opensuse.org 25 Oct '11

25 Oct '11

Author: gs Date: Tue Oct 25 14:35:03 2011 New Revision: 66571 URL: http://svn.opensuse.org/viewcvs/yast?rev=66571&view=rev Log: 2.21.2 Modified: trunk/ncurses-pkg/VERSION trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Modified: trunk/ncurses-pkg/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/VERSION?rev=66571&r1… ============================================================================== --- trunk/ncurses-pkg/VERSION (original) +++ trunk/ncurses-pkg/VERSION Tue Oct 25 14:35:03 2011 @@ -1 +1 @@ -2.21.1 +2.21.2 Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/package/yast2-ncurse… ============================================================================== --- trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Tue Oct 25 14:35:03 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 25 14:25:38 CEST 2011 - gs(a)suse.de + +- Set action 'Show Summary' correctly (menu 'Configuration', + 'Action after Package Installation') +- 2.21.2 + +------------------------------------------------------------------- Tue Aug 2 17:32:01 UTC 2011 - lslezak(a)suse.cz - added new ignoreAlreadyRecommended solver option to -- 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] r66570 - /tags/stable-2_21_6/devtools/
by lslezak＠svn2.opensuse.org 25 Oct '11

25 Oct '11

Author: lslezak Date: Tue Oct 25 14:28:12 2011 New Revision: 66570 URL: http://svn.opensuse.org/viewcvs/yast?rev=66570&view=rev Log: Created tag stable-2_21_6 for devtools Added: tags/stable-2_21_6/devtools/ - copied from r66569, trunk/devtools/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66569 - in /trunk/devtools: VERSION devtools/bin/oscsubmit package/yast2-devtools.changes
by lslezak＠svn2.opensuse.org 25 Oct '11

25 Oct '11

Author: lslezak Date: Tue Oct 25 14:28:02 2011 New Revision: 66569 URL: http://svn.opensuse.org/viewcvs/yast?rev=66569&view=rev Log: - fixed oscsubmit to not submit *.rej and *.orig files left after failed merging - 2.21.6 Modified: trunk/devtools/VERSION trunk/devtools/devtools/bin/oscsubmit (contents, props changed) trunk/devtools/package/yast2-devtools.changes Modified: trunk/devtools/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/VERSION?rev=66569&r1=66… ============================================================================== --- trunk/devtools/VERSION (original) +++ trunk/devtools/VERSION Tue Oct 25 14:28:02 2011 @@ -1 +1 @@ -2.21.5 +2.21.6 Modified: trunk/devtools/devtools/bin/oscsubmit URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/oscsubmit?… ============================================================================== --- trunk/devtools/devtools/bin/oscsubmit (original) +++ trunk/devtools/devtools/bin/oscsubmit Tue Oct 25 14:28:02 2011 @@ -86,7 +86,11 @@ # FIXME directory may be empty rm $OBS_PROJECT/$PACKAGE/* 2>&1 | tee -a $LOGFILE test -d build/package && cp build/package/* $OBS_PROJECT/$PACKAGE # needed for cmake-based modules + cp package/* $OBS_PROJECT/$PACKAGE +# do not submit *.rej and *.orig files left after failed patching/merging +rm -rf $OBS_PROJECT/$PACKAGE/*.rej $OBS_PROJECT/$PACKAGE/*.orig + echo "OK" | tee -a $LOGFILE diff $OBS_PROJECT/$PACKAGE/*changes $OBS_PROJECT/$PACKAGE/.osc/*changes >diff test -f $OBS_PROJECT/$PACKAGE/.osc/*changes || echo "< New package" >diff Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Tue Oct 25 14:28:02 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 25 12:14:21 UTC 2011 - lslezak(a)suse.cz + +- fixed oscsubmit to not submit *.rej and *.orig files left after + failed merging +- 2.21.6 + +------------------------------------------------------------------- Tue Oct 4 15:12:21 CEST 2011 - visnov(a)suse.cz - remove definition of Prefix in spec file (create-spec) -- 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] r66568 - /trunk/ncurses-pkg/src/NCPkgMenuConfig.cc
by gs＠svn2.opensuse.org 25 Oct '11

25 Oct '11

Author: gs Date: Tue Oct 25 14:24:42 2011 New Revision: 66568 URL: http://svn.opensuse.org/viewcvs/yast?rev=66568&view=rev Log: set correct exit action Modified: trunk/ncurses-pkg/src/NCPkgMenuConfig.cc Modified: trunk/ncurses-pkg/src/NCPkgMenuConfig.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuConfig.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuConfig.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuConfig.cc Tue Oct 25 14:24:42 2011 @@ -125,7 +125,7 @@ { exitAction = "close"; } - else if ( event.selection == restart ) + else if ( event.selection == showSummary ) { exitAction = "summary"; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0