April 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r57016 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Source_Resolvables.cc
by lslezak＠svn.opensuse.org 29 Apr '09

29 Apr '09

Author: lslezak Date: Wed Apr 29 08:51:26 2009 New Revision: 57016 URL: http://svn.opensuse.org/viewcvs/yast?rev=57016&view=rev Log: - report also the URL when repository metadata are not found (bnc#439069) - 2.18.4 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Source_Resolvables.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=57016&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Wed Apr 29 08:51:26 2009 @@ -1 +1 @@ -2.18.3 +2.18.4 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Wed Apr 29 08:51:26 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 29 08:45:52 CEST 2009 - lslezak(a)suse.cz + +- report also the URL when repository metadata are not found + (bnc#439069) +- 2.18.4 + +------------------------------------------------------------------- Tue Apr 21 19:18:16 CEST 2009 - lslezak(a)suse.cz - Pkg::ResolvableDependencies() - also return raw (unresolved) Modified: trunk/pkg-bindings/src/Source_Resolvables.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Resolvab… ============================================================================== --- trunk/pkg-bindings/src/Source_Resolvables.cc (original) +++ trunk/pkg-bindings/src/Source_Resolvables.cc Wed Apr 29 08:51:26 2009 @@ -126,8 +126,9 @@ if (!autorefresh_skipped) { std::string alias = repoinfo.alias(); + zypp::Url url(repoinfo.url()); y2error ("Resolvables from '%s' havn't been loaded: %s", alias.c_str(), excpt.asString().c_str()); - _last_error.setLastError("'" + alias + "': " + ExceptionAsString(excpt)); + _last_error.setLastError("'" + alias + "': " + url.asString() + "\n" + ExceptionAsString(excpt)); success = false; } else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57015 - in /trunk/packager: package/yast2-packager.changes src/include/repositories_include.ycp
by lslezak＠svn.opensuse.org 28 Apr '09

28 Apr '09

Author: lslezak Date: Tue Apr 28 20:41:34 2009 New Revision: 57015 URL: http://svn.opensuse.org/viewcvs/yast?rev=57015&view=rev Log: - removed the extra error popup when adding a repository fails (bnc#269034) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/include/repositories_include.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Apr 28 20:41:34 2009 @@ -2,6 +2,8 @@ Tue Apr 28 16:33:41 CEST 2009 - lslezak(a)suse.cz - use URL.ycp for processing smb:// URLs (bnc#495109) +- removed the extra error popup when adding a repository fails + (bnc#269034) ------------------------------------------------------------------- Thu Apr 23 17:16:36 CEST 2009 - lslezak(a)suse.cz Modified: trunk/packager/src/include/repositories_include.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/repositorie… ============================================================================== --- trunk/packager/src/include/repositories_include.ycp (original) +++ trunk/packager/src/include/repositories_include.ycp Tue Apr 28 20:41:34 2009 @@ -159,7 +159,7 @@ const string iso_prefix = "iso:"; if (substring(url, 0, size(iso_prefix)) == iso_prefix) { - y2milestone("ISO image detected, disabling autorefresh (%1)", url); + y2milestone("ISO image detected, disabling autorefresh (%1)", URL::HidePassword(url)); auto_refresh = false; } @@ -167,7 +167,7 @@ boolean cd_scheme = contains(["cd", "dvd"], tolower(URL::Parse(url)["scheme"]:"")); if (cd_scheme) { - y2milestone("CD/DVD repository detected, disabling autorefresh (%1)", url); + y2milestone("CD/DVD repository detected, disabling autorefresh (%1)", URL::HidePassword(url)); auto_refresh = false; } @@ -255,7 +255,10 @@ Progress::NextStage(); integer new_repo_id = Pkg::RepositoryAdd(repo_prop); - y2milestone("Added repository: %1: %2", new_repo_id, repo_prop); + + map<string,any> repo_prop_log = repo_prop; + repo_prop_log["base_urls"] = [ URL::HidePassword(url) ]; + y2milestone("Added repository: %1: %2", new_repo_id, repo_prop_log); newSources = add(newSources, new_repo_id); @@ -279,27 +282,32 @@ if ( size( newSources ) == 0 ) { - // popup message part 1 - string _msg1 = sformat( _("Unable to create repository -from URL '%1'."), URL::HidePassword(url) ); + y2error("Cannot add the repository"); if (regexpmatch(url, "\\.iso$")) { + // popup message part 1 + string msg = sformat( _("Unable to create repository +from URL '%1'."), URL::HidePassword(url) ); + map parsed_url = URL::Parse(url); string scheme = tolower(parsed_url["scheme"]:""); if (contains(["ftp", "sftp", "http", "https"], scheme)) { // error message - _msg1 = _msg1 + "\n\n" + _("Using an ISO image over ftp or http protocol is not possible.\nChange the protocol or unpack the ISO image on the server side."); + msg = msg + "\n\n" + _("Using an ISO image over ftp or http protocol is not possible. +Change the protocol or unpack the ISO image on the server side."); + + // popup message part 2 + msg = msg + "\n\n" + _("Change the URL and try again?"); + + boolean tryagain = Popup::YesNo(msg); + if (tryagain) return `again; } } - // popup message part 2 - string _msg2 = _("Try again?"); - boolean tryagain = Popup::YesNo( _msg1 + "\n" + Pkg::LastError() + "\n" + _msg2 ); - if ( tryagain ) return `again; - else return `cancel; + return `cancel; } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57014 - in /trunk/packager: package/yast2-packager.changes src/modules/SourceDialogs.ycp
by lslezak＠svn.opensuse.org 28 Apr '09

28 Apr '09

Author: lslezak Date: Tue Apr 28 17:10:14 2009 New Revision: 57014 URL: http://svn.opensuse.org/viewcvs/yast?rev=57014&view=rev Log: - use URL.ycp for processing smb:// URLs (bnc#495109) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SourceDialogs.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Apr 28 17:10:14 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 28 16:33:41 CEST 2009 - lslezak(a)suse.cz + +- use URL.ycp for processing smb:// URLs (bnc#495109) + +------------------------------------------------------------------- Thu Apr 23 17:16:36 CEST 2009 - lslezak(a)suse.cz - added a new progress dialog when registering a new repository, Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialo… ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Tue Apr 28 17:10:14 2009 @@ -1262,7 +1262,7 @@ { string workgroup = (string)UI::QueryWidget (`id (`workgroup), `Value); if (type == `samba && size (workgroup) > 0) - directory = directory + ";workgroup=" + workgroup; + parsed["domain"] = workgroup; } parsed["path"] = directory; @@ -1494,14 +1494,7 @@ dir = sharepath[1]:""; if (dir == nil) dir = "/"; - string workgroup = ""; - if (regexpmatch (dir, "^.*;workgroup=[^;]+$")) - { - workgroup = regexpsub (dir, - "^.*;workgroup=([^;]+)$", "\\1"); - dir = regexpsub (dir, "^(.*);workgroup=[^;]+$", "\\1"); - } - UI::ChangeWidget (`id (`workgroup), `Value, workgroup); + UI::ChangeWidget (`id (`workgroup), `Value, parsed["domain"]:""); UI::ChangeWidget (`id (`share), `Value, share); } UI::ChangeWidget (`id (`dir), `Value, dir); -- 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] r57013 - in /trunk/yast2: library/types/src/URL.ycp library/types/testsuite/tests/URL.out library/types/testsuite/tests/URL.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 28 Apr '09

28 Apr '09

Author: lslezak Date: Tue Apr 28 17:09:55 2009 New Revision: 57013 URL: http://svn.opensuse.org/viewcvs/yast?rev=57013&view=rev Log: - URL.ycp - fixed processing of smb:// URLs (bnc#495109) Modified: trunk/yast2/library/types/src/URL.ycp trunk/yast2/library/types/testsuite/tests/URL.out trunk/yast2/library/types/testsuite/tests/URL.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/types/src/URL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/src/URL.ycp?… ============================================================================== --- trunk/yast2/library/types/src/URL.ycp (original) +++ trunk/yast2/library/types/src/URL.ycp Tue Apr 28 17:09:55 2009 @@ -150,6 +150,9 @@ return ret; } +global map <string, string> MakeMapFromParams (string params); +global string MakeParamsFromMap (map <string, string> params_map); + /** * Tokenize URL * @param url URL to be parsed @@ -242,14 +245,19 @@ } // some exceptions for samba scheme (there is optional extra option "domain") - if (tokens["scheme"]:""=="samba" || tokens["scheme"]:""=="smb"){ - list<string> tmp_list = filter(string row, splitstring(tokens["path"]:"", "/"), {return (size(row)>0);}); - if (size(tmp_list)>1){ - tokens["domain"] = tokens["host"]:""; - tokens["host"] = tmp_list[0]:""; - tokens["path"] = tmp_list[1]:""; - } - else tokens["path"] = deletechars(tokens["path"]:"", "/"); + if (tokens["scheme"]:""=="samba" || tokens["scheme"]:""=="smb") + { + // Note: CUPS uses different URL syntax for Samba printers: + // smb://username:password@workgroup/server/printer + // Fortunately yast2-printer does not use URL.ycp, so we can safely support libzypp syntax only: + // smb://username:passwd@servername/share/path/on/the/share?workgroup=mygroup + + map<string,string> options = MakeMapFromParams(tokens["query"]:""); + + if (haskey(options, "workgroup")) + { + tokens["domain"] = options["workgroup"]:""; + } } y2debug("tokens=%1", tokens); return tokens; @@ -333,10 +341,6 @@ url = sformat("%1://%2", url, userpass); y2debug("url: %1", url); - if (tokens["scheme"]:"" == "smb" && size(tokens["domain"]:"")>0 ){ - url = sformat("%1%2/", url, tokens["domain"]:""); - } - if(Hostname::CheckFQ(tokens["host"]:"") || IP::Check(tokens["host"]:"")) { // enclose an IPv6 address in square brackets @@ -369,8 +373,19 @@ } y2debug("url: %1", url); + + map<string,string> query_map = MakeMapFromParams(tokens["query"]:""); + + if (tokens["scheme"]:"" == "smb" && size(tokens["domain"]:"")>0 && query_map["workgroup"]:"" != tokens["domain"]:"") + { + query_map["workgroup"] = tokens["domain"]:""; + + tokens["query"] = MakeParamsFromMap(query_map); + } + if (tokens["query"]:"" != "" ) url = sformat("%1?%2", url, URLRecode::EscapeQuery(tokens["query"]:"")); + if (tokens["fragment"]:"" != "" ) url = sformat("%1#%2", url, URLRecode::EscapePassword(tokens["fragment"]:"")); y2debug("url: %1", url); Modified: trunk/yast2/library/types/testsuite/tests/URL.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/te… ============================================================================== --- trunk/yast2/library/types/testsuite/tests/URL.out (original) +++ trunk/yast2/library/types/testsuite/tests/URL.out Tue Apr 28 17:09:55 2009 @@ -28,6 +28,9 @@ Return $["fragment":"", "host":"2001:de8:0:f123::1", "pass":"", "path":"/path/to/dir", "port":"", "query":"", "scheme":"http", "user":""] Return $["fragment":"", "host":"2001:de8:0:f123::1", "pass":"password", "path":"/path/to/dir", "port":"8080", "query":"", "scheme":"http", "user":"user"] Return http://user:password@[2001:de8:0:f123::1]:8080/path/to/dir +Return $["domain":"group", "fragment":"", "host":"servername", "pass":"passwd", "path":"/share/path/on/the/share", "port":"", "query":"mountoptions=ro&workgroup=group", "scheme":"smb", "user":"username"] +Return true +Return smb://username:passwd@myserver.com/share%24%24share/path/on/the/share?workgroup=workgroup Return dir:/// Return http://download.opensuse.org/very/log/path/which/will/be/truncated/target_f… Return http://download.opensuse.org/.../target_file Modified: trunk/yast2/library/types/testsuite/tests/URL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/te… ============================================================================== --- trunk/yast2/library/types/testsuite/tests/URL.ycp (original) +++ trunk/yast2/library/types/testsuite/tests/URL.ycp Tue Apr 28 17:09:55 2009 @@ -62,6 +62,13 @@ TEST(``(URL::Parse("http://user:password@[2001:de8:0:f123::1]:8080/path/to/dir")), [], nil); TEST(``(URL::Build(URL::Parse("http://user:password@[2001:de8:0:f123::1]:8080/path/to/dir"))), [], nil); +// smb:// tests +string smb_url = "smb://username:passwd@servername/share/path/on/the/share?mountoptions=ro&workgroup=group"; +TEST(``(URL::Parse(smb_url)), [], nil); +// parse->build must return the orginal value +TEST(``(URL::Build(URL::Parse(smb_url)) == smb_url), [], nil); +// bnc#491482 +TEST(``(URL::Build( $["domain":"workgroup", "host":"myserver.com", "pass":"passwd", "path":"/share$$share/path/on/the/share", "scheme":"smb", "user":"username"])), [], nil); TEST(``(URL::Build(URL::Parse("dir:///"))), [], 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 Apr 28 17:09:55 2009 @@ -3,6 +3,7 @@ - URL.ycp - escape also non-ASCII characters in URL, added URLRecode.pm module (bnc#446395) +- URL.ycp - fixed processing of smb:// URLs (bnc#495109) ------------------------------------------------------------------- Mon Apr 20 16:11:35 CEST 2009 - jsrain(a)suse.cz -- 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] r57012 - in /trunk/storage/libstorage/src: PeContainer.cc PeContainer.h
by aschnell＠svn.opensuse.org 28 Apr '09

28 Apr '09

Author: aschnell Date: Tue Apr 28 16:52:03 2009 New Revision: 57012 URL: http://svn.opensuse.org/viewcvs/yast?rev=57012&view=rev Log: - added const Modified: trunk/storage/libstorage/src/PeContainer.cc trunk/storage/libstorage/src/PeContainer.h Modified: trunk/storage/libstorage/src/PeContainer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/PeContain… ============================================================================== --- trunk/storage/libstorage/src/PeContainer.cc (original) +++ trunk/storage/libstorage/src/PeContainer.cc Tue Apr 28 16:52:03 2009 @@ -405,8 +405,9 @@ return( ret ); } -bool PeContainer::findPe( const string& dev, const std::list<Pv>& pl, - std::list<Pv>::const_iterator& i ) const + +bool +PeContainer::findPe(const string& dev, const list<Pv>& pl, list<Pv>::const_iterator& i) const { bool ret = !pl.empty(); if( ret ) @@ -429,8 +430,9 @@ return( ret ); } -bool PeContainer::findPe( const string& dev, std::list<Pv>& pl, - std::list<Pv>::iterator& i ) + +bool +PeContainer::findPe(const string& dev, list<Pv>& pl, list<Pv>::iterator& i) const { bool ret = !pl.empty(); if( ret ) Modified: trunk/storage/libstorage/src/PeContainer.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/PeContain… ============================================================================== --- trunk/storage/libstorage/src/PeContainer.h (original) +++ trunk/storage/libstorage/src/PeContainer.h Tue Apr 28 16:52:03 2009 @@ -113,10 +113,8 @@ string addList() const; virtual void print( std::ostream& s ) const { s << *this; } virtual Container* getCopy() const { return( new PeContainer( *this ) ); } - bool findPe( const string& dev, const std::list<Pv>& pl, - std::list<Pv>::const_iterator& i ) const; - bool findPe( const string& dev, std::list<Pv>& pl, - std::list<Pv>::iterator& i ); + bool findPe(const string& dev, const list<Pv>& pl, list<Pv>::const_iterator& i) const; + bool findPe(const string& dev, list<Pv>& pl, list<Pv>::iterator& i) const; unsigned long leByLvRemove() const; int tryUnusePe( const string& dev, std::list<Pv>& pl, std::list<Pv>& pladd, std::list<Pv>& plrem, unsigned long& removed_pe ); -- 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] r57011 - in /trunk/bootloader: package/yast2-bootloader.changes src/clients/bootloader_finish.ycp
by juhliarik＠svn.opensuse.org 28 Apr '09

28 Apr '09

Author: juhliarik Date: Tue Apr 28 16:50:01 2009 New Revision: 57011 URL: http://svn.opensuse.org/viewcvs/yast?rev=57011&view=rev Log: synchronize with SLE11 Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/clients/bootloader_finish.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Apr 28 16:50:01 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 28 16:48:12 CEST 2009 - juhliarik(a)suse.cz + +- added updated patch from IBM and reipl (bnc#471522) + +------------------------------------------------------------------- Tue Apr 28 16:37:43 CEST 2009 - juhliarik(a)suse.cz - disable checking thinkpad sequence in MBR also save content of Modified: trunk/bootloader/src/clients/bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloade… ============================================================================== --- trunk/bootloader/src/clients/bootloader_finish.ycp (original) +++ trunk/bootloader/src/clients/bootloader_finish.ycp Tue Apr 28 16:50:01 2009 @@ -93,9 +93,9 @@ // where we do a hard reboot. However, the cdrom is still mounted here // and cant be removed. + map finish_ret = nil; if (Arch::s390 ()) { - map finish_ret = nil; string reipl_client = "reipl_bootloader_finish"; // Calling a special reIPL client @@ -103,15 +103,24 @@ if (WFM::ClientExists (reipl_client)) { finish_ret = (map) WFM::call (reipl_client); + y2milestone ("result of reipl_bootloader_finish [%1, %2]", finish_ret["different"]:"N/A", finish_ret["ipl_msg"]:"N/A2"); + y2milestone ("finish_ret[\"different\"]:true == true : %1", finish_ret["different"]:true == true); + if (finish_ret["different"]:false == true) { + y2milestone ("finish_ret[\"different\"] is true"); + } else { + y2milestone ("finish_ret[\"different\"] is not true (either undefined or false)"); + } } else { y2error ("No such client: %1", reipl_client); } + } + + if (Arch::s390 () && finish_ret["different"]:true == true) + { // reIPL message string ipl_msg = ""; - if (finish_ret["different"]:false == true) { - ipl_msg = finish_ret["ipl_msg"]:""; - } + ipl_msg = finish_ret["ipl_msg"]:""; // SSH modification string usessh_msg = ""; -- 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] r57010 - in /trunk/bootloader: package/yast2-bootloader.changes src/grub/misc.ycp src/modules/BootCommon.ycp src/routines/i386.ycp src/routines/misc.ycp
by juhliarik＠svn.opensuse.org 28 Apr '09

28 Apr '09

Author: juhliarik Date: Tue Apr 28 16:39:07 2009 New Revision: 57010 URL: http://svn.opensuse.org/viewcvs/yast?rev=57010&view=rev Log: disable checking of thinkpad sequence Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/routines/i386.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Apr 28 16:39:07 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 28 16:37:43 CEST 2009 - juhliarik(a)suse.cz + +- disable checking thinkpad sequence in MBR also save content of + MBR (bnc#464485) + +------------------------------------------------------------------- Wed Apr 22 15:47:26 CEST 2009 - jreidinger(a)suse.cz - code clean Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev… ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Tue Apr 28 16:39:07 2009 @@ -311,6 +311,15 @@ "/bin/dd if=%1 of=%2 bs=512 count=1 2>&1", device, "/boot/backup_mbr")); + // save thinkpad MBR + if (BootCommon::ThinkPadMBR(device)) + { + string device_file_path_thinkpad = device_file_path + "thinkpadMBR"; + y2milestone("Backup thinkpad MBR"); + SCR::Execute(.target.bash, sformat ( + "cp %1 %2 2>&1", device_file_path, device_file_path_thinkpad)); + } + } } Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommo… ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Tue Apr 28 16:39:07 2009 @@ -299,6 +299,7 @@ global map<string,any> CreateLinuxSection (string title); global string UpdateSerialConsole (string append, string console); global string examineMBR (string device); +global boolean ThinkPadMBR (string disk); /* * help message and dscription definitions Modified: trunk/bootloader/src/routines/i386.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/i386.ycp… ============================================================================== --- trunk/bootloader/src/routines/i386.ycp (original) +++ trunk/bootloader/src/routines/i386.ycp Tue Apr 28 16:39:07 2009 @@ -115,8 +115,14 @@ * @return boolean true to keep the contents */ global boolean KeepMBR (string disk) { - if (ThinkPadMBR (disk)) - return true; + + // FIXME: see bug #464485 there is problem with detection of + // MBR the 3rd byte is 0 after recovery thinkpad notebook with + // recovery CD, next missing cooperate with Lenovo there also + // missing any specification about Lenovo's changes in MBR + + y2milestone("Skip checking of MBR for thinkpad sequence"); + return false; } Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp… ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Tue Apr 28 16:39:07 2009 @@ -44,6 +44,7 @@ global map<string, integer> Md2Partitions (string md_device); global void DetectDisks (); global string getBootPartition(); + /** * return printable name of bootloader @@ -775,6 +776,15 @@ "/bin/dd if=%1 of=%2 bs=512 count=1 2>&1", device, "/boot/backup_mbr")); + // save thinkpad MBR + if (BootCommon::ThinkPadMBR(device)) + { + string device_file_path_thinkpad = device_file_path + "thinkpadMBR"; + y2milestone("Backup thinkpad MBR"); + SCR::Execute(.target.bash, sformat ( + "cp %1 %2 2>&1", device_file_path, device_file_path_thinkpad)); + } + } } -- 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] r57009 - /tags/stable-2_18_30/network/
by mzugec＠svn.opensuse.org 28 Apr '09

28 Apr '09

Author: mzugec Date: Tue Apr 28 16:04:12 2009 New Revision: 57009 URL: http://svn.opensuse.org/viewcvs/yast?rev=57009&view=rev Log: Created tag stable-2_18_30 for network Added: tags/stable-2_18_30/network/ - copied from r57008, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57008 - /tags/stable-2_18_30/
by mzugec＠svn.opensuse.org 28 Apr '09

28 Apr '09

Author: mzugec Date: Tue Apr 28 16:04:07 2009 New Revision: 57008 URL: http://svn.opensuse.org/viewcvs/yast?rev=57008&view=rev Log: Created tag stable-2_18_30 Added: tags/stable-2_18_30/ -- 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] r57007 - in /trunk/network: VERSION package/yast2-network.changes src/lan/hardware.ycp src/modules/LanItems.ycp
by mzugec＠svn.opensuse.org 28 Apr '09

28 Apr '09

Author: mzugec Date: Tue Apr 28 16:03:47 2009 New Revision: 57007 URL: http://svn.opensuse.org/viewcvs/yast?rev=57007&view=rev Log: correctly read/write module options (bnc#487656) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/hardware.ycp trunk/network/src/modules/LanItems.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=57007&r1=570… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Apr 28 16:03:47 2009 @@ -1 +1 @@ -2.18.29 +2.18.30 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Apr 28 16:03:47 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 28 16:02:37 CEST 2009 - mzugec(a)suse.de + +- correctly read/write module options (bnc#487656) +- 2.18.30 + +------------------------------------------------------------------- Mon Apr 27 10:15:25 CEST 2009 - mzugec(a)suse.de - improved "device renaming" functionality (bnc#447480) and Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev… ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Tue Apr 28 16:03:47 2009 @@ -506,7 +506,7 @@ y2milestone("interface without hwinfo, proposing STARTMODE=auto"); LanItems::startmode="auto"; } -} + } string driver = (string) UI::QueryWidget(`modul, `Value); LanItems::setDriver(driver); Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp… ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Tue Apr 28 16:03:47 2009 @@ -182,8 +182,8 @@ udev_net_rules = (map<string, any>)SCR::Read(.udev_persistent.net); y2milestone ("Reading driver options ..."); - foreach(string driver, SCR::Dir(.modprobe.network.options), { - string pth=sformat(".modprobe.network.options.%1",driver); + foreach(string driver, SCR::Dir(.modules.options), { + string pth=sformat(".modules.options.%1",driver); // driver_options[driver] = SCR::Read(topath(pth)); foreach(string key, string value, (map<string, string>)SCR::Read(topath(pth)), { driver_options[driver] = sformat("%1%2%3=%4", driver_options[driver]:"", @@ -256,9 +256,9 @@ val[ l[0]:"" ]=l[1]:""; }); if (!hasAnyValue(value)) val=nil; - SCR::Write(add(.modprobe.network.options, key), val); + SCR::Write(add(.modules.options, key), val); }); - SCR::Write(.modprobe.network,nil); + SCR::Write(.modules,nil); } /** -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0