August 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r65489 - in /branches/SuSE-SLE-10-SP3-Branch/core: ./ agent-ini/src/ agent-ini/testsuite/tests/ libycp/src/ libycp/testsuite/tests/builtin/ package/ wfm/src/
by mvidner＠svn2.opensuse.org 31 Aug '11

31 Aug '11

Author: mvidner Date: Wed Aug 31 19:23:06 2011 New Revision: 65489 URL: http://svn.opensuse.org/viewcvs/yast?rev=65489&view=rev Log: Make same as the SP4 version svn merge -c65487 http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP4-Branch/core Modified: branches/SuSE-SLE-10-SP3-Branch/core/ (props changed) branches/SuSE-SLE-10-SP3-Branch/core/VERSION branches/SuSE-SLE-10-SP3-Branch/core/agent-ini/src/IniParser.h branches/SuSE-SLE-10-SP3-Branch/core/agent-ini/testsuite/tests/nonex.err branches/SuSE-SLE-10-SP3-Branch/core/libycp/src/YCPBuiltinString.cc branches/SuSE-SLE-10-SP3-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.err branches/SuSE-SLE-10-SP3-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.out branches/SuSE-SLE-10-SP3-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.ycp branches/SuSE-SLE-10-SP3-Branch/core/package/yast2-core.changes branches/SuSE-SLE-10-SP3-Branch/core/wfm/src/Y2WFMComponent.cc Modified: branches/SuSE-SLE-10-SP3-Branch/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/core/V… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/core/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/core/VERSION Wed Aug 31 19:23:06 2011 @@ -1 +1 @@ -2.13.45.1 +2.13.48 Modified: branches/SuSE-SLE-10-SP3-Branch/core/agent-ini/src/IniParser.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/core/a… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/core/agent-ini/src/IniParser.h (original) +++ branches/SuSE-SLE-10-SP3-Branch/core/agent-ini/src/IniParser.h Wed Aug 31 19:23:06 2011 @@ -370,6 +370,7 @@ // apparently the uninitialized members are filled in // by the grammar definition IniParser () : + timestamp (0), linecomments (), comments (), sections (), params (), rewrites (), started (false), multiple_files (false), Modified: branches/SuSE-SLE-10-SP3-Branch/core/agent-ini/testsuite/tests/nonex.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/core/a… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/core/agent-ini/testsuite/tests/nonex.err (original) +++ branches/SuSE-SLE-10-SP3-Branch/core/agent-ini/testsuite/tests/nonex.err Wed Aug 31 19:23:06 2011 @@ -1,7 +1,5 @@ [agent-ini] IniParser.cc(parse):XXX Can not open tests/nonex.in.test. [agent-ini] IniParser.cc(getTimeStamp):XXX Unable to stat 'tests/nonex.in.test': No such file or directory -[agent-ini] IniParser.cc(UpdateIfModif):XXX Data file 'tests/nonex.in.test' was changed externaly! -[agent-ini] IniParser.cc(parse):XXX Can not open tests/nonex.in.test. [YCP] tests/nonex.ycp:XXX KEY: nil [agent-ini] IniParser.cc(UpdateIfModif):XXX Data file 'tests/nonex.in.test' was changed externaly! [YCP] tests/nonex.ycp:XXX KEY: value Modified: branches/SuSE-SLE-10-SP3-Branch/core/libycp/src/YCPBuiltinString.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/core/l… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/core/libycp/src/YCPBuiltinString.cc (original) +++ branches/SuSE-SLE-10-SP3-Branch/core/libycp/src/YCPBuiltinString.cc Wed Aug 31 19:23:06 2011 @@ -735,10 +735,10 @@ /// (regexp builtins) typedef struct REG_RET { - string result_str; + string result_str; // for regexpsub string match_str[SUB_MAX]; // index 0 not used!! int match_nb; // 0 - 9 - string error_str; + string error_str; // from regerror bool error; bool solved; } Reg_Ret; @@ -747,6 +747,7 @@ /* * Universal regular expression solver. * It is used by all regexp* ycp builtins. + * Replacement is done if result is not "" */ Reg_Ret solve_regular_expression (const char *input, const char *pattern, const char *result) @@ -788,27 +789,38 @@ return reg_ret; } - static const char *index[] = { - NULL, /* not used */ - "\\1", "\\2", "\\3", "\\4", - "\\5", "\\6", "\\7", "\\8", "\\9" - }; - string input_str (input); - string result_str (result); for (unsigned int i=0; (i <= compiled.re_nsub) && (i <= SUB_MAX); i++) { reg_ret.match_str[i] = matchptr[i].rm_so >= 0 ? input_str.substr(matchptr[i].rm_so, matchptr[i].rm_eo - matchptr[i].rm_so) : ""; reg_ret.match_nb = i; - - string::size_type col = string::npos; - if(index[i] != NULL) col = result_str.find(index[i]); - while( col != string::npos ) { - result_str.replace( col, 2, reg_ret.match_str[i] ); - col = result_str.find(index[i], col + 1 ); - } } + + string result_str; + const char * done = result; // text before 'done' has been dealt with + const char * bspos = result; + + + while (1) { + bspos = strchr (bspos, '\\'); + if (bspos == NULL) // not found + break; + + // STATE: \ seen + ++bspos; + + if (*bspos >= '1' && *bspos <= '9') { + // copy non-backslash text + result_str.append (done, bspos - 1 - done); + // copy replacement string + result_str += reg_ret.match_str[*bspos - '0']; + done = bspos = bspos + 1; + } + } + // copy the rest + result_str += done; + reg_ret.result_str = result_str; regfree (&compiled); return reg_ret; Modified: branches/SuSE-SLE-10-SP3-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/core/l… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.err (original) +++ branches/SuSE-SLE-10-SP3-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.err Wed Aug 31 19:23:06 2011 @@ -142,6 +142,34 @@ ---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- +(regexpsub ("aaabbb", "(a*b)(.*)", "\\1") == "aaab") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(regexpsub ("aaabbb", "(a*b)(.*)", "\\1\\1") == "aaabaaab") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(regexpsub ("aaabbb", "(a*b)(.*)", "\\") == "\\") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(regexpsub ("aaabbb", "(a*b)(.*)", "\\\\") == "\\\\") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(regexpsub ("aaabbb", "(a*b)(.*)", "A\\NZ") == "A\\NZ") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(regexpsub ("aaabbb", "(a*b)(.*)", "A\\\\1Z") == "A\\aaabZ") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(regexpsub ("machine=i386\\2ci486\\2ci586\\2ci686", "^([^=]*)=(.*)", "\\2") == "i386\\2ci486\\2ci586\\2ci686") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- (regexptokenize ("aaabbBb", "(.*[[:upper:]]).*") == ["aaabbB"]) ---------------------------------------------------------------------- Parsed: Modified: branches/SuSE-SLE-10-SP3-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/core/l… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.out (original) +++ branches/SuSE-SLE-10-SP3-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.out Wed Aug 31 19:23:06 2011 @@ -37,6 +37,13 @@ (true) (true) (true) +(true) +(true) +(true) +(true) +(true) +(true) +(true) ("** sformat **") ("five is greater % than 3") ("** conversions **") Modified: branches/SuSE-SLE-10-SP3-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/core/l… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.ycp Wed Aug 31 19:23:06 2011 @@ -65,6 +65,14 @@ (regexpsub ("aaabbb", "(.*ab).*", "s_\\1_e") == "s_aaab_e") (regexpsub ("aaabbb", "(.*abb)(.*)", "s_\\1_e\\2") == "s_aaabb_eb") +// bnc#552914 +(regexpsub ("aaabbb", "(a*b)(.*)", "\\1") == "aaab") +(regexpsub ("aaabbb", "(a*b)(.*)", "\\1\\1") == "aaabaaab") +(regexpsub ("aaabbb", "(a*b)(.*)", "\\") == "\\") +(regexpsub ("aaabbb", "(a*b)(.*)", "\\\\") == "\\\\") +(regexpsub ("aaabbb", "(a*b)(.*)", "A\\NZ") == "A\\NZ") +(regexpsub ("aaabbb", "(a*b)(.*)", "A\\\\1Z") == "A\\aaabZ") +(regexpsub ("machine=i386\\2ci486\\2ci586\\2ci686", "^([^=]*)=(.*)", "\\2") == "i386\\2ci486\\2ci586\\2ci686") (regexptokenize ("aaabbBb", "(.*[[:upper:]]).*") == [ "aaabbB" ]) (regexptokenize ("aaabbb", "(.*ab)(.*)") == ["aaab", "bb"]) Modified: branches/SuSE-SLE-10-SP3-Branch/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/core/p… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/core/package/yast2-core.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/core/package/yast2-core.changes Wed Aug 31 19:23:06 2011 @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Fri Aug 5 08:54:30 CEST 2011 - mvidner(a)suse.cz +Wed Aug 31 19:06:00 CEST 2011 - mvidner(a)suse.cz - Prevent YaST hanging when threads are used (bnc#708367), backport: - Log the C backtrace when receiving a signal (FATE#302167). @@ -7,7 +7,25 @@ - Resurrected logging in the signal handler, into /var/log/YaST2/signal (or ./y2signal.log) (bnc#493152#c33). - /var/log/YaST2/signal: do not make it executable -- 2.13.45.1 +- 2.13.48 + +------------------------------------------------------------------- +Wed Aug 31 18:10:21 CEST 2011 - mvidner(a)suse.cz + +- Log YCP client arguments only with y2debug, not to reveal AutoYaST + passwords (bnc#492746). +- Fixed the regexpsub algorithm not to loop endlessly + if the source string contains \1 (bnc#552914). +- ini-agent: Fixed a test failure "wrong stderr for nonex" + (bnc#706705#c16) +- 2.13.47 + +------------------------------------------------------------------- +Thu Aug 18 12:40:23 CEST 2011 - mvidner(a)suse.cz + +- change blowfish id from 2a to 2y (bnc#700876 bnc#706705 CVE-2011-2483) + (thanks to Ludwig Nussel) +- 2.13.46 ------------------------------------------------------------------- Thu Nov 5 15:11:47 CET 2009 - jsrain(a)suse.cz Modified: branches/SuSE-SLE-10-SP3-Branch/core/wfm/src/Y2WFMComponent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/core/w… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/core/wfm/src/Y2WFMComponent.cc (original) +++ branches/SuSE-SLE-10-SP3-Branch/core/wfm/src/Y2WFMComponent.cc Wed Aug 31 19:23:06 2011 @@ -684,7 +684,9 @@ string filename = ee.filename (); int linenumber = ee.linenumber (); ycp2milestone (filename.c_str(), linenumber, - "Calling YaST client %s (arguments: %s)", new_modulename.c_str (), args->toString ().c_str ()); + "Calling YaST client %s", new_modulename.c_str ()); + ycp2debug (filename.c_str(), linenumber, + "(arguments: %s)", args->toString ().c_str ()); YCPValue result = client_comp->doActualWork (args, NULL); ee.setFilename (filename); ee.setLinenumber (linenumber); -- 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] r65488 - in /branches/SuSE-SLE-10-SP4-Branch/core: ./ VERSION agent-system/src/ShellCommand.cc liby2/src/Y2ProgramComponent.cc liby2/src/genericfrontend.cc package/yast2-core.changes
by mvidner＠svn2.opensuse.org 31 Aug '11

31 Aug '11

Author: mvidner Date: Wed Aug 31 19:13:13 2011 New Revision: 65488 URL: http://svn.opensuse.org/viewcvs/yast?rev=65488&view=rev Log: Merged from SP3 SVN. Tested by the customer, it did not help the problem and in the end the bug was in glibc, BUT the patch does switch to thread safe functions and adds the backtrace, useful for future maintenance. Prevent YaST hanging when threads are used (bnc#708367), backport: - Log the C backtrace when receiving a signal (FATE#302167). - avoid y2log in both signal handler and forked children (bnc#493152) - Resurrected logging in the signal handler, into /var/log/YaST2/signal (or ./y2signal.log) (bnc#493152#c33). - /var/log/YaST2/signal: do not make it executable svn merge -c65234 http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP3-Branch/core Modified: branches/SuSE-SLE-10-SP4-Branch/core/ (props changed) branches/SuSE-SLE-10-SP4-Branch/core/VERSION branches/SuSE-SLE-10-SP4-Branch/core/agent-system/src/ShellCommand.cc branches/SuSE-SLE-10-SP4-Branch/core/liby2/src/Y2ProgramComponent.cc branches/SuSE-SLE-10-SP4-Branch/core/liby2/src/genericfrontend.cc branches/SuSE-SLE-10-SP4-Branch/core/package/yast2-core.changes Modified: branches/SuSE-SLE-10-SP4-Branch/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/core/V… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/core/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/core/VERSION Wed Aug 31 19:13:13 2011 @@ -1 +1 @@ -2.13.47 +2.13.48 Modified: branches/SuSE-SLE-10-SP4-Branch/core/agent-system/src/ShellCommand.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/core/a… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/core/agent-system/src/ShellCommand.cc (original) +++ branches/SuSE-SLE-10-SP4-Branch/core/agent-system/src/ShellCommand.cc Wed Aug 31 19:13:13 2011 @@ -117,7 +117,7 @@ FILE *stream2 = fdopen (pipe2[0], "r"); if (stream2 == 0) { - y2error ("stream2 fdopen error"); + y2error ("stream2 fdopen error"); _exit (1); } close (pipe2[1]); @@ -126,7 +126,8 @@ { if (out) fputs (s2, out); - y2debug ("%s", s2); + //bnc#493152#c24 + //y2debug ("%s", s2); } fclose (stream2); @@ -154,7 +155,7 @@ else ret = WTERMSIG (ret) + 128; - y2debug ("Exit status is %d", ret); + //y2debug ("Exit status is %d", ret); if (!tempdir.empty ()) { Modified: branches/SuSE-SLE-10-SP4-Branch/core/liby2/src/Y2ProgramComponent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/core/l… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/core/liby2/src/Y2ProgramComponent.cc (original) +++ branches/SuSE-SLE-10-SP4-Branch/core/liby2/src/Y2ProgramComponent.cc Wed Aug 31 19:13:13 2011 @@ -291,13 +291,14 @@ // Call chroot if desired. if (chroot_path == "" || chroot_path == "/") { - y2debug ("Going to execute %s", bin_file.c_str ()); + //bnc#493152#c24 + //y2debug ("Going to execute %s", bin_file.c_str ()); } else { - y2debug ("Going to execute %s with chroot %s", bin_file.c_str (), - chroot_path.c_str ()); + /*y2debug ("Going to execute %s with chroot %s", bin_file.c_str (), + chroot_path.c_str ());*/ if (chroot (chroot_path.c_str ()) != 0) { - y2error ("Cannot chroot to %s: %s", chroot_path.c_str (), - strerror (errno)); + /*y2error ("Cannot chroot to %s: %s", chroot_path.c_str (), + strerror (errno));*/ _exit (5); } @@ -307,7 +308,7 @@ execv (bin_file.c_str (), argv); // execute program // this code is only reached if exec failed - y2error ("Cannot execute external program %s", bin_file.c_str ()); + //y2error ("Cannot execute external program %s", bin_file.c_str ()); _exit (5); // No sense in returning! I am forked away!! } Modified: branches/SuSE-SLE-10-SP4-Branch/core/liby2/src/genericfrontend.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/core/l… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/core/liby2/src/genericfrontend.cc (original) +++ branches/SuSE-SLE-10-SP4-Branch/core/liby2/src/genericfrontend.cc Wed Aug 31 19:13:13 2011 @@ -28,6 +28,10 @@ #include <stdarg.h> #include <unistd.h> #include <signal.h> +#include <execinfo.h> +#include <stdio.h> +#include <stdlib.h> +#include <errno.h> #include <sstream> #include <ycp/y2log.h> @@ -49,14 +53,119 @@ static void print_error (const char*, ...) __attribute__ ((format (printf, 1, 2))); static bool is_ycp_value (const char* arg); +int signal_log_fd; // fd to use for logging in signal handler + +static +void +signal_log_to_fd (int fd, const char * cs) +{ + ssize_t n = strlen (cs); + while (true) { + ssize_t w = write(fd, cs, n); + if (w == n) + break; // success + else if (w == -1) { + if (errno == EINTR) { + // perror("gotcha"); // bnc#470645 + } + else { + perror("write"); // other cases + break; + } + } + else { + errno = 0; + cs += w; + n -= w; + } + } + +} + +static +void +signal_log (const char * cs) +{ + signal_log_to_fd (signal_log_fd, cs); +} + +static +void +signal_log_timestamp () +{ + char buffer[200]; + time_t time_time; + struct tm tm_time; + + time_time = time(NULL); + localtime_r (&time_time, &tm_time); + + if (strftime(buffer, sizeof(buffer), "=== %F %T %z ===\n", &tm_time) != 0) + { + signal_log (buffer); + } +} + +// FATE 302167, info '(libc) Backtraces' +void +signal_log_backtrace () +{ + static const int N = 100; + void *frames[N]; + size_t size = backtrace (frames, N); + // demangling is not signal safe + signal_log ("Backtrace: (use c++filt to demangle)\n"); + backtrace_symbols_fd (frames, size, signal_log_fd); +} + +void +signal_log_open () +{ + signal_log_fd = -1; + + const char * logfns[] = { + "/var/log/YaST2/signal", + "y2signal.log", + NULL, // sentinel + }; + + for (const char ** logfn_p = &logfns[0]; *logfn_p != NULL; ++logfn_p) + { + signal_log_fd = open (*logfn_p, O_WRONLY | O_CREAT | O_APPEND, 0600); + if (signal_log_fd != -1) + break; + } +} + void signal_handler (int sig) { signal (sig, SIG_IGN); - fprintf (stderr, "YaST got signal %d at YCP file %s:%d\n", - sig, ee.filename ().c_str (), ee.linenumber ()); - y2error ("got signal %d at YCP file %s:%d", - sig, ee.filename ().c_str (), ee.linenumber ()); + + // bnc#493152#c19 only signal-safe functions are allowed + char buffer[200]; + int n = snprintf (buffer, sizeof(buffer), + "YaST got signal %d at YCP file %s:%d\n", + sig, ee.filename ().c_str (), ee.linenumber ()); + if (n >= (int)sizeof(buffer) || n < 0) + strcpy (buffer, "YaST got a signal.\n"); + signal_log_to_fd (STDERR_FILENO, buffer); + + signal_log_open (); + if (signal_log_fd == -1) + { + signal_log_to_fd (STDERR_FILENO, "Could not open log file.\n"); + } + else + { + signal_log_timestamp (); + signal_log (buffer); + signal_log_backtrace (); + + if (close (signal_log_fd) == -1) + perror ("log close"); + } + // bye signal (sig, SIG_DFL); kill ( getpid (), sig); Modified: branches/SuSE-SLE-10-SP4-Branch/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/core/p… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/core/package/yast2-core.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/core/package/yast2-core.changes Wed Aug 31 19:13:13 2011 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Wed Aug 31 19:06:00 CEST 2011 - mvidner(a)suse.cz + +- Prevent YaST hanging when threads are used (bnc#708367), backport: +- Log the C backtrace when receiving a signal (FATE#302167). +- avoid y2log in both signal handler and forked children (bnc#493152) +- Resurrected logging in the signal handler, into + /var/log/YaST2/signal (or ./y2signal.log) (bnc#493152#c33). +- /var/log/YaST2/signal: do not make it executable +- 2.13.48 + +------------------------------------------------------------------- Wed Aug 31 18:10:21 CEST 2011 - mvidner(a)suse.cz - Log YCP client arguments only with y2debug, not to reveal AutoYaST -- 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] r65487 - in /branches/SuSE-SLE-10-SP4-Branch/core: ./ agent-ini/src/ agent-ini/testsuite/tests/ libycp/src/ libycp/testsuite/tests/builtin/ package/ wfm/src/
by mvidner＠svn2.opensuse.org 31 Aug '11

31 Aug '11

Author: mvidner Date: Wed Aug 31 18:21:07 2011 New Revision: 65487 URL: http://svn.opensuse.org/viewcvs/yast?rev=65487&view=rev Log: Merging fixes from SLE11-SP1 for a SLE10-SP3,SP4 update - Log YCP client arguments only with y2debug, not to reveal AutoYaST passwords (bnc#492746). - Fixed the regexpsub algorithm not to loop endlessly if the source string contains \1 (bnc#552914). - ini-agent: Fixed a test failure "wrong stderr for nonex" (bnc#706705#c16) svn merge -c61272 -c65446 -c65449 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP1-Branch/core Modified: branches/SuSE-SLE-10-SP4-Branch/core/ (props changed) branches/SuSE-SLE-10-SP4-Branch/core/VERSION branches/SuSE-SLE-10-SP4-Branch/core/agent-ini/src/IniParser.h branches/SuSE-SLE-10-SP4-Branch/core/agent-ini/testsuite/tests/nonex.err branches/SuSE-SLE-10-SP4-Branch/core/libycp/src/YCPBuiltinString.cc branches/SuSE-SLE-10-SP4-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.err branches/SuSE-SLE-10-SP4-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.out branches/SuSE-SLE-10-SP4-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.ycp branches/SuSE-SLE-10-SP4-Branch/core/package/yast2-core.changes branches/SuSE-SLE-10-SP4-Branch/core/wfm/src/Y2WFMComponent.cc Modified: branches/SuSE-SLE-10-SP4-Branch/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/core/V… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/core/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/core/VERSION Wed Aug 31 18:21:07 2011 @@ -1 +1 @@ -2.13.46 +2.13.47 Modified: branches/SuSE-SLE-10-SP4-Branch/core/agent-ini/src/IniParser.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/core/a… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/core/agent-ini/src/IniParser.h (original) +++ branches/SuSE-SLE-10-SP4-Branch/core/agent-ini/src/IniParser.h Wed Aug 31 18:21:07 2011 @@ -370,6 +370,7 @@ // apparently the uninitialized members are filled in // by the grammar definition IniParser () : + timestamp (0), linecomments (), comments (), sections (), params (), rewrites (), started (false), multiple_files (false), Modified: branches/SuSE-SLE-10-SP4-Branch/core/agent-ini/testsuite/tests/nonex.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/core/a… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/core/agent-ini/testsuite/tests/nonex.err (original) +++ branches/SuSE-SLE-10-SP4-Branch/core/agent-ini/testsuite/tests/nonex.err Wed Aug 31 18:21:07 2011 @@ -1,7 +1,5 @@ [agent-ini] IniParser.cc(parse):XXX Can not open tests/nonex.in.test. [agent-ini] IniParser.cc(getTimeStamp):XXX Unable to stat 'tests/nonex.in.test': No such file or directory -[agent-ini] IniParser.cc(UpdateIfModif):XXX Data file 'tests/nonex.in.test' was changed externaly! -[agent-ini] IniParser.cc(parse):XXX Can not open tests/nonex.in.test. [YCP] tests/nonex.ycp:XXX KEY: nil [agent-ini] IniParser.cc(UpdateIfModif):XXX Data file 'tests/nonex.in.test' was changed externaly! [YCP] tests/nonex.ycp:XXX KEY: value Modified: branches/SuSE-SLE-10-SP4-Branch/core/libycp/src/YCPBuiltinString.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/core/l… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/core/libycp/src/YCPBuiltinString.cc (original) +++ branches/SuSE-SLE-10-SP4-Branch/core/libycp/src/YCPBuiltinString.cc Wed Aug 31 18:21:07 2011 @@ -735,10 +735,10 @@ /// (regexp builtins) typedef struct REG_RET { - string result_str; + string result_str; // for regexpsub string match_str[SUB_MAX]; // index 0 not used!! int match_nb; // 0 - 9 - string error_str; + string error_str; // from regerror bool error; bool solved; } Reg_Ret; @@ -747,6 +747,7 @@ /* * Universal regular expression solver. * It is used by all regexp* ycp builtins. + * Replacement is done if result is not "" */ Reg_Ret solve_regular_expression (const char *input, const char *pattern, const char *result) @@ -788,27 +789,38 @@ return reg_ret; } - static const char *index[] = { - NULL, /* not used */ - "\\1", "\\2", "\\3", "\\4", - "\\5", "\\6", "\\7", "\\8", "\\9" - }; - string input_str (input); - string result_str (result); for (unsigned int i=0; (i <= compiled.re_nsub) && (i <= SUB_MAX); i++) { reg_ret.match_str[i] = matchptr[i].rm_so >= 0 ? input_str.substr(matchptr[i].rm_so, matchptr[i].rm_eo - matchptr[i].rm_so) : ""; reg_ret.match_nb = i; - - string::size_type col = string::npos; - if(index[i] != NULL) col = result_str.find(index[i]); - while( col != string::npos ) { - result_str.replace( col, 2, reg_ret.match_str[i] ); - col = result_str.find(index[i], col + 1 ); - } } + + string result_str; + const char * done = result; // text before 'done' has been dealt with + const char * bspos = result; + + + while (1) { + bspos = strchr (bspos, '\\'); + if (bspos == NULL) // not found + break; + + // STATE: \ seen + ++bspos; + + if (*bspos >= '1' && *bspos <= '9') { + // copy non-backslash text + result_str.append (done, bspos - 1 - done); + // copy replacement string + result_str += reg_ret.match_str[*bspos - '0']; + done = bspos = bspos + 1; + } + } + // copy the rest + result_str += done; + reg_ret.result_str = result_str; regfree (&compiled); return reg_ret; Modified: branches/SuSE-SLE-10-SP4-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/core/l… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.err (original) +++ branches/SuSE-SLE-10-SP4-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.err Wed Aug 31 18:21:07 2011 @@ -142,6 +142,34 @@ ---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- +(regexpsub ("aaabbb", "(a*b)(.*)", "\\1") == "aaab") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(regexpsub ("aaabbb", "(a*b)(.*)", "\\1\\1") == "aaabaaab") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(regexpsub ("aaabbb", "(a*b)(.*)", "\\") == "\\") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(regexpsub ("aaabbb", "(a*b)(.*)", "\\\\") == "\\\\") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(regexpsub ("aaabbb", "(a*b)(.*)", "A\\NZ") == "A\\NZ") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(regexpsub ("aaabbb", "(a*b)(.*)", "A\\\\1Z") == "A\\aaabZ") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(regexpsub ("machine=i386\\2ci486\\2ci586\\2ci686", "^([^=]*)=(.*)", "\\2") == "i386\\2ci486\\2ci586\\2ci686") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- (regexptokenize ("aaabbBb", "(.*[[:upper:]]).*") == ["aaabbB"]) ---------------------------------------------------------------------- Parsed: Modified: branches/SuSE-SLE-10-SP4-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/core/l… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.out (original) +++ branches/SuSE-SLE-10-SP4-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.out Wed Aug 31 18:21:07 2011 @@ -37,6 +37,13 @@ (true) (true) (true) +(true) +(true) +(true) +(true) +(true) +(true) +(true) ("** sformat **") ("five is greater % than 3") ("** conversions **") Modified: branches/SuSE-SLE-10-SP4-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/core/l… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/core/libycp/testsuite/tests/builtin/Builtin-String1.ycp Wed Aug 31 18:21:07 2011 @@ -65,6 +65,14 @@ (regexpsub ("aaabbb", "(.*ab).*", "s_\\1_e") == "s_aaab_e") (regexpsub ("aaabbb", "(.*abb)(.*)", "s_\\1_e\\2") == "s_aaabb_eb") +// bnc#552914 +(regexpsub ("aaabbb", "(a*b)(.*)", "\\1") == "aaab") +(regexpsub ("aaabbb", "(a*b)(.*)", "\\1\\1") == "aaabaaab") +(regexpsub ("aaabbb", "(a*b)(.*)", "\\") == "\\") +(regexpsub ("aaabbb", "(a*b)(.*)", "\\\\") == "\\\\") +(regexpsub ("aaabbb", "(a*b)(.*)", "A\\NZ") == "A\\NZ") +(regexpsub ("aaabbb", "(a*b)(.*)", "A\\\\1Z") == "A\\aaabZ") +(regexpsub ("machine=i386\\2ci486\\2ci586\\2ci686", "^([^=]*)=(.*)", "\\2") == "i386\\2ci486\\2ci586\\2ci686") (regexptokenize ("aaabbBb", "(.*[[:upper:]]).*") == [ "aaabbB" ]) (regexptokenize ("aaabbb", "(.*ab)(.*)") == ["aaab", "bb"]) Modified: branches/SuSE-SLE-10-SP4-Branch/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/core/p… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/core/package/yast2-core.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/core/package/yast2-core.changes Wed Aug 31 18:21:07 2011 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Wed Aug 31 18:10:21 CEST 2011 - mvidner(a)suse.cz + +- Log YCP client arguments only with y2debug, not to reveal AutoYaST + passwords (bnc#492746). +- Fixed the regexpsub algorithm not to loop endlessly + if the source string contains \1 (bnc#552914). +- ini-agent: Fixed a test failure "wrong stderr for nonex" + (bnc#706705#c16) +- 2.13.47 + +------------------------------------------------------------------- Thu Aug 18 12:40:23 CEST 2011 - mvidner(a)suse.cz - change blowfish id from 2a to 2y (bnc#700876 bnc#706705 CVE-2011-2483) Modified: branches/SuSE-SLE-10-SP4-Branch/core/wfm/src/Y2WFMComponent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/core/w… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/core/wfm/src/Y2WFMComponent.cc (original) +++ branches/SuSE-SLE-10-SP4-Branch/core/wfm/src/Y2WFMComponent.cc Wed Aug 31 18:21:07 2011 @@ -684,7 +684,9 @@ string filename = ee.filename (); int linenumber = ee.linenumber (); ycp2milestone (filename.c_str(), linenumber, - "Calling YaST client %s (arguments: %s)", new_modulename.c_str (), args->toString ().c_str ()); + "Calling YaST client %s", new_modulename.c_str ()); + ycp2debug (filename.c_str(), linenumber, + "(arguments: %s)", args->toString ().c_str ()); YCPValue result = client_comp->doActualWork (args, NULL); ee.setFilename (filename); ee.setLinenumber (linenumber); -- 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] r65486 - /trunk/autoinstallation/doc/xml/ScriptsSection.xml
by ug＠svn2.opensuse.org 31 Aug '11

31 Aug '11

Author: ug Date: Wed Aug 31 17:08:59 2011 New Revision: 65486 URL: http://svn.opensuse.org/viewcvs/yast?rev=65486&view=rev Log: better scripts docu Modified: trunk/autoinstallation/doc/xml/ScriptsSection.xml Modified: trunk/autoinstallation/doc/xml/ScriptsSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Scripts… ============================================================================== --- trunk/autoinstallation/doc/xml/ScriptsSection.xml (original) +++ trunk/autoinstallation/doc/xml/ScriptsSection.xml Wed Aug 31 17:08:59 2011 @@ -108,7 +108,7 @@ <entry>filename</entry> <entry>the filename of the script. It will be stored in a temporary directory under /tmp/... <para><screen><filename>myPreScript5.sh</filename></screen></para></entry> - <entry>optional. The default is the type of the script (pre-scripts) in this case</entry> + <entry>optional. The default is the type of the script (pre-scripts) in this case. If you have more than one script, you should set the filename to a reasonable value</entry> </row> <row> <entry>feedback</entry> @@ -202,7 +202,7 @@ <entry>filename</entry> <entry>the filename of the script. It will be stored in a temporary directory under /tmp/... <para><screen><filename>myScript5.sh</filename></screen></para></entry> - <entry>optional. The default is the type of the script (postpartitioning-scripts in this case)</entry> + <entry>optional. The default is the type of the script (postpartitioning-scripts in this case). If you have more than one script, you should set the filename to a reasonable value</entry> </row> <row> <entry>feedback</entry> @@ -305,7 +305,7 @@ <entry>filename</entry> <entry>the filename of the script. It will be stored in a temporary directory under /tmp/... <para><screen><filename>myPreScript5.sh</filename></screen></para></entry> - <entry>optional. The default is the type of the script (chroot-scripts) in this case</entry> + <entry>optional. The default is the type of the script (chroot-scripts) in this case. If you have more than one script, you should set the filename to a reasonable value</entry> </row> <row> <entry>feedback</entry> @@ -409,7 +409,7 @@ <entry>filename</entry> <entry>the filename of the script. It will be stored in a temporary directory under /tmp/... <para><screen><filename>myPostScript5.sh</filename></screen></para></entry> - <entry>optional. The default is the type of the script (post-scripts) in this case</entry> + <entry>optional. The default is the type of the script (post-scripts) in this case. If you have more than one script, you should set the filename to a reasonable value</entry> </row> <row> <entry>feedback</entry> @@ -501,7 +501,7 @@ <entry>filename</entry> <entry>the filename of the script. It will be stored in a temporary directory under /tmp/... <para><screen><filename>mynitScript5.sh</filename></screen></para></entry> - <entry>optional. The default is the type of the script (init-scripts) in this case</entry> + <entry>optional. The default is the type of the script (init-scripts) in this case. If you have more than one script, you should set the filename to a reasonable value</entry> </row> <row> <entry>rerun</entry> -- 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] r65485 - in /trunk/network: VERSION package/yast2-network.changes yast2-network.spec.in
by mvidner＠svn2.opensuse.org 31 Aug '11

31 Aug '11

Author: mvidner Date: Wed Aug 31 16:51:02 2011 New Revision: 65485 URL: http://svn.opensuse.org/viewcvs/yast?rev=65485&view=rev Log: bump+changes, depend on his NetworkInterfaces change Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/yast2-network.spec.in Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=65485&r1=654… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Aug 31 16:51:02 2011 @@ -1 +1 @@ -2.21.4 +2.21.5 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 Wed Aug 31 16:51:02 2011 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Aug 31 16:23:38 CEST 2011 - mvidner(a)suse.cz + +- More YaPI improvements from Justus Winter: + - Write: default BOOTPROTO to 'static', allow omitting IPADDR + - Allow manipulating STARTMODE, don't assume 'auto'. + - Handle ETHERDEVICE and VLAN_ID. +- 2.21.5 + +------------------------------------------------------------------- Wed Aug 17 15:02:50 CEST 2011 - mvidner(a)suse.cz - Sort of enable arbitrary interface names. Modified: trunk/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/yast2-network.spec.in?re… ============================================================================== --- trunk/network/yast2-network.spec.in (original) +++ trunk/network/yast2-network.spec.in Wed Aug 31 16:51:02 2011 @@ -10,9 +10,9 @@ BuildRequires: yast2-country BuildRequires: yast2-installation >= 2.15.27 -# NetworkInterfaces::GetTypeFromIfcfg (bnc#572747) -BuildRequires: yast2 >= 2.21.6 -Requires: yast2 >= 2.21.6 +# NetworkInterfaces::Write should write ifcfgs only once +BuildRequires: yast2 >= 2.21.14 +Requires: yast2 >= 2.21.14 #netconfig (FaTE #303618) Requires: sysconfig >= 0.71.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] r65484 - in /trunk/network: src/lan/YaPI/NETWORK.pm testsuite/tests/Network_YaPI.out testsuite/tests/Network_YaPI.ycp
by mvidner＠svn2.opensuse.org 31 Aug '11

31 Aug '11

Author: mvidner Date: Wed Aug 31 16:51:00 2011 New Revision: 65484 URL: http://svn.opensuse.org/viewcvs/yast?rev=65484&view=rev Log: YaPI::NETWORK: Handle ETHERDEVICE and VLAN_ID. Author: Justus Winter <winter(a)pre-sense.de> Modified: trunk/network/src/lan/YaPI/NETWORK.pm trunk/network/testsuite/tests/Network_YaPI.out trunk/network/testsuite/tests/Network_YaPI.ycp 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 Wed Aug 31 16:51:00 2011 @@ -44,6 +44,12 @@ } } $configuration{'mtu'} = LanItems->mtu; + if (LanItems->vlan_id){ + $configuration{'vlan_id'} = LanItems->vlan_id; + } + if (LanItems->vlan_etherdevice){ + $configuration{'vlan_etherdevice'} = LanItems->vlan_etherdevice; + } $interfaces{LanItems->interfacename}=\%configuration; } elsif (LanItems->getCurrentItem()->{'hwinfo'}->{'type'} eq "eth") { my $device = LanItems->getCurrentItem()->{"hwinfo"}->{"dev_name"}; @@ -158,6 +164,12 @@ if (defined $ifc->{'mtu'}) { $config{"MTU"} = $ifc->{'mtu'}; } + if (defined $ifc->{'vlan_id'}) { + $config{"VLAN_ID"} = $ifc->{'vlan_id'}; + } + if (defined $ifc->{'vlan_etherdevice'}) { + $config{"ETHERDEVICE"} = $ifc->{'vlan_etherdevice'}; + } NetworkInterfaces->Current(\%config); NetworkInterfaces->Commit(); NetworkInterfaces->Write(""); Modified: trunk/network/testsuite/tests/Network_YaPI.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Network_… ============================================================================== --- trunk/network/testsuite/tests/Network_YaPI.out (original) +++ trunk/network/testsuite/tests/Network_YaPI.out Wed Aug 31 16:51:00 2011 @@ -12,7 +12,7 @@ Execute .target.bash "rpm -q --whatprovides SuSEfirewall2" 0 Read .init.scripts.exists "SuSEfirewall2_init" false Read .sysconfig.sysctl.IP_FORWARD nil -Dir .network.section: ["eth0", "eth1", "eth2", "eth3", "eth4"] +Dir .network.section: ["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth5.23"] Dir .network.value."eth0": ["BOOTPROTO", "STARTMODE"] Read .network.value."eth0".BOOTPROTO "dhcp4" Read .network.value."eth0".STARTMODE "manual" @@ -36,6 +36,15 @@ Read .network.value."eth4".IPADDR "1.2.3.7" Read .network.value."eth4".NETMASK "255.255.255.0" Read .network.value."eth4".STARTMODE "auto" +Dir .network.value."eth5": ["BOOTPROTO", "STARTMODE"] +Read .network.value."eth5".BOOTPROTO "static" +Read .network.value."eth5".STARTMODE "auto" +Dir .network.value."eth5.23": ["BOOTPROTO", "ETHERDEVICE", "IPADDR", "STARTMODE", "VLAN_ID"] +Read .network.value."eth5.23".BOOTPROTO "static" +Read .network.value."eth5.23".ETHERDEVICE "eth5" +Read .network.value."eth5.23".IPADDR "1.2.3.8/24" +Read .network.value."eth5.23".STARTMODE "auto" +Read .network.value."eth5.23".VLAN_ID "23" Read .target.size "/etc/install.inf" 27 Dir .etc.install_inf: [] Read .target.string "/proc/cmdline" "laptop.suse.cz" @@ -51,7 +60,7 @@ Read .target.lstat "/etc/sysconfig/network/ifcfg-tr-usb" nil Execute .target.bash_output "hostname --fqdn" $["exit":0, "stdout":"laptop.suse.cz"] Execute .target.bash_output "hostname --fqdn" $["exit":0, "stdout":"laptop.suse.cz"] -Return $["dns":$["nameservers":["208.67.222.222", "208.67.220.220"], "searches":["suse.cz", "suse.de"]], "hostname":$["dhcp_hostname":"1", "domain":"suse.cz", "name":"laptop"], "interfaces":$["eth0":$["bootproto":"dhcp4", "mtu":"", "startmode":"manual"], "eth1":$["bootproto":"static", "ipaddr":"1.2.3.4/24", "mtu":"1234", "startmode":"auto"], "eth2":$["bootproto":"static", "ipaddr":"1.2.3.5/24", "mtu":"", "startmode":"auto"], "eth3":$["bootproto":"static", "ipaddr":"1.2.3.6/24", "mtu":"", "startmode":"auto"], "eth4":$["bootproto":"static", "ipaddr":"1.2.3.7/24", "mtu":"", "startmode":"auto"]], "routes":$["default":$["via":"10.20.30.40"]]] +Return $["dns":$["nameservers":["208.67.222.222", "208.67.220.220"], "searches":["suse.cz", "suse.de"]], "hostname":$["dhcp_hostname":"1", "domain":"suse.cz", "name":"laptop"], "interfaces":$["eth0":$["bootproto":"dhcp4", "mtu":"", "startmode":"manual"], "eth1":$["bootproto":"static", "ipaddr":"1.2.3.4/24", "mtu":"1234", "startmode":"auto"], "eth2":$["bootproto":"static", "ipaddr":"1.2.3.5/24", "mtu":"", "startmode":"auto"], "eth3":$["bootproto":"static", "ipaddr":"1.2.3.6/24", "mtu":"", "startmode":"auto"], "eth4":$["bootproto":"static", "ipaddr":"1.2.3.7/24", "mtu":"", "startmode":"auto"], "eth5":$["bootproto":"static", "ipaddr":"", "mtu":"", "startmode":"auto"], "eth5.23":$["bootproto":"static", "ipaddr":"1.2.3.8/24", "mtu":"", "startmode":"auto", "vlan_etherdevice":"eth5", "vlan_id":"23"]], "routes":$["default":$["via":"10.20.30.40"]]] Return $["error":"", "exit":"0"] Write .network.value."eth0".BOOTPROTO "dhcp4" true Write .network.value."eth0".STARTMODE "auto" true @@ -79,6 +88,14 @@ Write .network nil true Read .init.scripts.exists "network" false Return $["error":"", "exit":"0"] +Write .network.value."eth5.23".BOOTPROTO "static" true +Write .network.value."eth5.23".ETHERDEVICE "eth5" true +Write .network.value."eth5.23".IPADDR "1.2.3.8/24" true +Write .network.value."eth5.23".STARTMODE "auto" true +Write .network.value."eth5.23".VLAN_ID "42" true +Write .network nil true +Read .init.scripts.exists "network" false +Return $["error":"", "exit":"0"] Read .target.size "/etc/sysconfig/network/routes" 27 Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] Read .init.scripts.exists "SuSEfirewall2_init" false @@ -95,4 +112,4 @@ Read .target.lstat "/etc/sysconfig/network/ifcfg-tr-usb" nil Execute .target.bash_output "hostname --fqdn" $["exit":0, "stdout":"laptop.suse.cz"] Execute .target.bash_output "hostname --fqdn" $["exit":0, "stdout":"laptop.suse.cz"] -Return $["dns":$["nameservers":["208.67.222.222", "208.67.220.220"], "searches":["suse.cz", "suse.de"]], "hostname":$["dhcp_hostname":"1", "domain":"suse.cz", "name":"laptop"], "interfaces":$["eth0":$["bootproto":"dhcp4", "mtu":"", "startmode":"auto"], "eth1":$["bootproto":"static", "ipaddr":"1.2.3.4/24", "mtu":"1234", "startmode":"auto"], "eth2":$["bootproto":"static", "ipaddr":"1.2.3.5/24", "mtu":"", "startmode":"auto"], "eth3":$["bootproto":"static", "ipaddr":"1.2.3.7/24", "mtu":"", "startmode":"auto"], "eth4":$["bootproto":"static", "ipaddr":"1.2.3.7/24", "mtu":"", "startmode":"auto"]], "routes":$["default":$["via":"10.20.30.40"]]] +Return $["dns":$["nameservers":["208.67.222.222", "208.67.220.220"], "searches":["suse.cz", "suse.de"]], "hostname":$["dhcp_hostname":"1", "domain":"suse.cz", "name":"laptop"], "interfaces":$["eth0":$["bootproto":"dhcp4", "mtu":"", "startmode":"auto"], "eth1":$["bootproto":"static", "ipaddr":"1.2.3.4/24", "mtu":"1234", "startmode":"auto"], "eth2":$["bootproto":"static", "ipaddr":"1.2.3.5/24", "mtu":"", "startmode":"auto"], "eth3":$["bootproto":"static", "ipaddr":"1.2.3.7/24", "mtu":"", "startmode":"auto"], "eth4":$["bootproto":"static", "ipaddr":"1.2.3.7/24", "mtu":"", "startmode":"auto"], "eth5":$["bootproto":"static", "ipaddr":"", "mtu":"", "startmode":"auto"], "eth5.23":$["bootproto":"static", "ipaddr":"1.2.3.8/24", "mtu":"", "startmode":"auto", "vlan_etherdevice":"eth5", "vlan_id":"42"]], "routes":$["default":$["via":"10.20.30.40"]]] Modified: trunk/network/testsuite/tests/Network_YaPI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Network_… ============================================================================== --- trunk/network/testsuite/tests/Network_YaPI.ycp (original) +++ trunk/network/testsuite/tests/Network_YaPI.ycp Wed Aug 31 16:51:00 2011 @@ -32,6 +32,8 @@ "eth2":$[], "eth3":$[], "eth4":$[], + "eth5":$[], + "eth5.23":$[], ], "value" : $[ "eth0" : $[ @@ -62,6 +64,17 @@ "IPADDR" : "1.2.3.7", "NETMASK" : "255.255.255.0", ], + "eth5" : $[ + "STARTMODE" : "auto", + "BOOTPROTO" : "static", + ], + "eth5.23" : $[ + "STARTMODE" : "auto", + "BOOTPROTO" : "static", + "IPADDR" : "1.2.3.8/24", + "VLAN_ID" : "23", + "ETHERDEVICE" : "eth5", + ], ], ], "routes" : [ $["destination":"default", "gateway":"10.20.30.40"] ] @@ -89,7 +102,12 @@ // test incorrect default route (invalid gw IP) TEST(``(YaPI::NETWORK::Write($["route":$["default":$["via":"10.20.30"]]])), [READ], nil); +// test setting the network prefix length for an interface that was previously configured via netmask TEST(``(YaPI::NETWORK::Write($["interface":$["eth3":$["bootproto":"static", "ipaddr":"1.2.3.7/24"]]])), [READ], nil); + +// test vlan_id change +TEST(``(YaPI::NETWORK::Write($["interface":$["eth5.23":$["bootproto":"static", "ipaddr":"1.2.3.8/24", "vlan_etherdevice":"eth5", "vlan_id":"42"]]])), [READ], nil); + TEST(``(YaPI::NETWORK::Read()), [READ, $[], EXEC], nil); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65483 - in /trunk/network: src/lan/YaPI/NETWORK.pm testsuite/tests/Network_YaPI.out testsuite/tests/Network_YaPI.ycp
by mvidner＠svn2.opensuse.org 31 Aug '11

31 Aug '11

Author: mvidner Date: Wed Aug 31 16:50:56 2011 New Revision: 65483 URL: http://svn.opensuse.org/viewcvs/yast?rev=65483&view=rev Log: YaPI::NETWORK: Allow manipulating STARTMODE, don't assume 'auto'. Author: Justus Winter <winter(a)pre-sense.de> Modified: trunk/network/src/lan/YaPI/NETWORK.pm trunk/network/testsuite/tests/Network_YaPI.out trunk/network/testsuite/tests/Network_YaPI.ycp 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 Wed Aug 31 16:50:56 2011 @@ -32,13 +32,12 @@ 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' ); - + my %configuration = ( + 'startmode' => LanItems->startmode ne ''? LanItems->startmode: 'manual', + 'bootproto' => LanItems->bootproto, + ); + if (LanItems->bootproto eq "static"){ $configuration{'ipaddr'} = LanItems->ipaddr; if (LanItems->prefix ne "") { $configuration{'ipaddr'} .= "/" . LanItems->prefix @@ -142,7 +141,7 @@ NetworkInterfaces->Read(); NetworkInterfaces->Add() unless NetworkInterfaces->Edit($dev); NetworkInterfaces->Name($dev); - my %config=("STARTMODE" => "auto", + my %config=("STARTMODE" => defined $ifc->{'startmode'}? $ifc->{'startmode'}: 'auto', "BOOTPROTO" => defined $ifc->{'bootproto'}? $ifc->{'bootproto'}: 'static', ); if (defined $ifc->{'ipaddr'}) { Modified: trunk/network/testsuite/tests/Network_YaPI.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Network_… ============================================================================== --- trunk/network/testsuite/tests/Network_YaPI.out (original) +++ trunk/network/testsuite/tests/Network_YaPI.out Wed Aug 31 16:50:56 2011 @@ -13,24 +13,29 @@ Read .init.scripts.exists "SuSEfirewall2_init" false Read .sysconfig.sysctl.IP_FORWARD nil Dir .network.section: ["eth0", "eth1", "eth2", "eth3", "eth4"] -Dir .network.value."eth0": ["BOOTPROTO"] +Dir .network.value."eth0": ["BOOTPROTO", "STARTMODE"] Read .network.value."eth0".BOOTPROTO "dhcp4" -Dir .network.value."eth1": ["BOOTPROTO", "IPADDR", "MTU"] +Read .network.value."eth0".STARTMODE "manual" +Dir .network.value."eth1": ["BOOTPROTO", "IPADDR", "MTU", "STARTMODE"] Read .network.value."eth1".BOOTPROTO "static" Read .network.value."eth1".IPADDR "1.2.3.4/24" Read .network.value."eth1".MTU "1234" -Dir .network.value."eth2": ["BOOTPROTO", "IPADDR", "PREFIXLEN"] +Read .network.value."eth1".STARTMODE "auto" +Dir .network.value."eth2": ["BOOTPROTO", "IPADDR", "PREFIXLEN", "STARTMODE"] Read .network.value."eth2".BOOTPROTO "static" Read .network.value."eth2".IPADDR "1.2.3.5/24" Read .network.value."eth2".PREFIXLEN "" -Dir .network.value."eth3": ["BOOTPROTO", "IPADDR", "PREFIXLEN"] +Read .network.value."eth2".STARTMODE "auto" +Dir .network.value."eth3": ["BOOTPROTO", "IPADDR", "PREFIXLEN", "STARTMODE"] Read .network.value."eth3".BOOTPROTO "static" Read .network.value."eth3".IPADDR "1.2.3.6" Read .network.value."eth3".PREFIXLEN "24" -Dir .network.value."eth4": ["BOOTPROTO", "IPADDR", "NETMASK"] +Read .network.value."eth3".STARTMODE "auto" +Dir .network.value."eth4": ["BOOTPROTO", "IPADDR", "NETMASK", "STARTMODE"] Read .network.value."eth4".BOOTPROTO "static" Read .network.value."eth4".IPADDR "1.2.3.7" Read .network.value."eth4".NETMASK "255.255.255.0" +Read .network.value."eth4".STARTMODE "auto" Read .target.size "/etc/install.inf" 27 Dir .etc.install_inf: [] Read .target.string "/proc/cmdline" "laptop.suse.cz" @@ -46,7 +51,12 @@ Read .target.lstat "/etc/sysconfig/network/ifcfg-tr-usb" nil Execute .target.bash_output "hostname --fqdn" $["exit":0, "stdout":"laptop.suse.cz"] Execute .target.bash_output "hostname --fqdn" $["exit":0, "stdout":"laptop.suse.cz"] -Return $["dns":$["nameservers":["208.67.222.222", "208.67.220.220"], "searches":["suse.cz", "suse.de"]], "hostname":$["dhcp_hostname":"1", "domain":"suse.cz", "name":"laptop"], "interfaces":$["eth0":$["bootproto":"dhcp4", "mtu":""], "eth1":$["bootproto":"static", "ipaddr":"1.2.3.4/24", "mtu":"1234"], "eth2":$["bootproto":"static", "ipaddr":"1.2.3.5/24", "mtu":""], "eth3":$["bootproto":"static", "ipaddr":"1.2.3.6/24", "mtu":""], "eth4":$["bootproto":"static", "ipaddr":"1.2.3.7/24", "mtu":""]], "routes":$["default":$["via":"10.20.30.40"]]] +Return $["dns":$["nameservers":["208.67.222.222", "208.67.220.220"], "searches":["suse.cz", "suse.de"]], "hostname":$["dhcp_hostname":"1", "domain":"suse.cz", "name":"laptop"], "interfaces":$["eth0":$["bootproto":"dhcp4", "mtu":"", "startmode":"manual"], "eth1":$["bootproto":"static", "ipaddr":"1.2.3.4/24", "mtu":"1234", "startmode":"auto"], "eth2":$["bootproto":"static", "ipaddr":"1.2.3.5/24", "mtu":"", "startmode":"auto"], "eth3":$["bootproto":"static", "ipaddr":"1.2.3.6/24", "mtu":"", "startmode":"auto"], "eth4":$["bootproto":"static", "ipaddr":"1.2.3.7/24", "mtu":"", "startmode":"auto"]], "routes":$["default":$["via":"10.20.30.40"]]] +Return $["error":"", "exit":"0"] +Write .network.value."eth0".BOOTPROTO "dhcp4" true +Write .network.value."eth0".STARTMODE "auto" true +Write .network nil true +Read .init.scripts.exists "network" false Return $["error":"", "exit":"0"] Read .target.size "/etc/sysconfig/network/routes" 27 Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] @@ -85,4 +95,4 @@ Read .target.lstat "/etc/sysconfig/network/ifcfg-tr-usb" nil Execute .target.bash_output "hostname --fqdn" $["exit":0, "stdout":"laptop.suse.cz"] Execute .target.bash_output "hostname --fqdn" $["exit":0, "stdout":"laptop.suse.cz"] -Return $["dns":$["nameservers":["208.67.222.222", "208.67.220.220"], "searches":["suse.cz", "suse.de"]], "hostname":$["dhcp_hostname":"1", "domain":"suse.cz", "name":"laptop"], "interfaces":$["eth0":$["bootproto":"dhcp4", "mtu":""], "eth1":$["bootproto":"static", "ipaddr":"1.2.3.4/24", "mtu":"1234"], "eth2":$["bootproto":"static", "ipaddr":"1.2.3.5/24", "mtu":""], "eth3":$["bootproto":"static", "ipaddr":"1.2.3.7/24", "mtu":""], "eth4":$["bootproto":"static", "ipaddr":"1.2.3.7/24", "mtu":""]], "routes":$["default":$["via":"10.20.30.40"]]] +Return $["dns":$["nameservers":["208.67.222.222", "208.67.220.220"], "searches":["suse.cz", "suse.de"]], "hostname":$["dhcp_hostname":"1", "domain":"suse.cz", "name":"laptop"], "interfaces":$["eth0":$["bootproto":"dhcp4", "mtu":"", "startmode":"auto"], "eth1":$["bootproto":"static", "ipaddr":"1.2.3.4/24", "mtu":"1234", "startmode":"auto"], "eth2":$["bootproto":"static", "ipaddr":"1.2.3.5/24", "mtu":"", "startmode":"auto"], "eth3":$["bootproto":"static", "ipaddr":"1.2.3.7/24", "mtu":"", "startmode":"auto"], "eth4":$["bootproto":"static", "ipaddr":"1.2.3.7/24", "mtu":"", "startmode":"auto"]], "routes":$["default":$["via":"10.20.30.40"]]] Modified: trunk/network/testsuite/tests/Network_YaPI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Network_… ============================================================================== --- trunk/network/testsuite/tests/Network_YaPI.ycp (original) +++ trunk/network/testsuite/tests/Network_YaPI.ycp Wed Aug 31 16:50:56 2011 @@ -35,24 +35,29 @@ ], "value" : $[ "eth0" : $[ + "STARTMODE" : "manual", "BOOTPROTO" : "dhcp4" ], "eth1" : $[ + "STARTMODE" : "auto", "BOOTPROTO" : "static", "IPADDR" : "1.2.3.4/24", "MTU" : "1234", ], "eth2" : $[ + "STARTMODE" : "auto", "BOOTPROTO" : "static", "IPADDR" : "1.2.3.5/24", "PREFIXLEN" : "", ], "eth3" : $[ + "STARTMODE" : "auto", "BOOTPROTO" : "static", "IPADDR" : "1.2.3.6", "PREFIXLEN" : "24", ], "eth4" : $[ + "STARTMODE" : "auto", "BOOTPROTO" : "static", "IPADDR" : "1.2.3.7", "NETMASK" : "255.255.255.0", @@ -75,6 +80,9 @@ TEST(``(YaPI::NETWORK::Write($[])), [$[], $[], $[]], nil); +// test manipulation of the startmode +TEST(``(YaPI::NETWORK::Write($["interface":$["eth0":$["bootproto":"dhcp4", "STARTMODE":"auto"]]])), [READ], nil); + // test correct default route TEST(``(YaPI::NETWORK::Write($["route":$["default":$["via":"10.20.30.40"]]])), [READ], nil); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65482 - /trunk/network/src/lan/YaPI/NETWORK.pm
by mvidner＠svn2.opensuse.org 31 Aug '11

31 Aug '11

Author: mvidner Date: Wed Aug 31 16:50:53 2011 New Revision: 65482 URL: http://svn.opensuse.org/viewcvs/yast?rev=65482&view=rev Log: YaPI::NETWORK::Write: Allow omitting IPADDR. Author: Justus Winter <winter(a)pre-sense.de> Modified: trunk/network/src/lan/YaPI/NETWORK.pm Modified: trunk/network/src/lan/YaPI/NETWORK.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/YaPI/NETWORK.pm?… ============================================================================== --- trunk/network/src/lan/YaPI/NETWORK.pm (original) +++ trunk/network/src/lan/YaPI/NETWORK.pm Wed Aug 31 16:50:53 2011 @@ -142,20 +142,20 @@ NetworkInterfaces->Read(); NetworkInterfaces->Add() unless NetworkInterfaces->Edit($dev); NetworkInterfaces->Name($dev); - my $ip = $ifc->{'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" => defined $ifc->{'bootproto'}? $ifc->{'bootproto'}: 'static', - "IPADDR" => $ip ); + if (defined $ifc->{'ipaddr'}) { + my $prefix = "32"; + YaST::YCP::Import ("Netmask"); + my @ip_row = split(/\//, $ifc->{'ipaddr'}); + $prefix = $ip_row[$#ip_row]; + if (Netmask->Check4($prefix) && $prefix =~ /\./){ + y2milestone("Valid netmask: ", $prefix, " will change to prefixlen"); + $prefix = Netmask->ToBits($prefix); + } + $config{"IPADDR"} = $ip_row[0]."/".$prefix; + } if (defined $ifc->{'mtu'}) { $config{"MTU"} = $ifc->{'mtu'}; } -- 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] r65481 - /trunk/network/src/lan/YaPI/NETWORK.pm
by mvidner＠svn2.opensuse.org 31 Aug '11

31 Aug '11

Author: mvidner Date: Wed Aug 31 16:50:45 2011 New Revision: 65481 URL: http://svn.opensuse.org/viewcvs/yast?rev=65481&view=rev Log: YaPI::NETWORK::Write: provide sensible default for BOOTPROTO. Author: Justus Winter <winter(a)pre-sense.de> Modified: trunk/network/src/lan/YaPI/NETWORK.pm Modified: trunk/network/src/lan/YaPI/NETWORK.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/YaPI/NETWORK.pm?… ============================================================================== --- trunk/network/src/lan/YaPI/NETWORK.pm (original) +++ trunk/network/src/lan/YaPI/NETWORK.pm Wed Aug 31 16:50:45 2011 @@ -153,7 +153,7 @@ } $ip = $ip_row[0]."/".$prefix; my %config=("STARTMODE" => "auto", - "BOOTPROTO" => $ifc->{'bootproto'}, + "BOOTPROTO" => defined $ifc->{'bootproto'}? $ifc->{'bootproto'}: 'static', "IPADDR" => $ip ); if (defined $ifc->{'mtu'}) { -- 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] r65480 - in /trunk/yast2: ./ library/network/src/ library/network/testsuite/tests/ package/
by mvidner＠svn2.opensuse.org 31 Aug '11

31 Aug '11

Author: mvidner Date: Wed Aug 31 16:28:04 2011 New Revision: 65480 URL: http://svn.opensuse.org/viewcvs/yast?rev=65480&view=rev Log: Update Deleted and OriginalDevices in NetworkInterfaces::Write not to write them over and over in subsequent calls via YaPI Author: Justus Winter <winter(a)pre-sense.de> Modified: trunk/yast2/VERSION trunk/yast2/library/network/src/NetworkInterfaces.ycp trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=65480&r1=65479… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Wed Aug 31 16:28:04 2011 @@ -1 +1 @@ -2.21.13 +2.21.14 Modified: trunk/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Networ… ============================================================================== --- trunk/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ trunk/yast2/library/network/src/NetworkInterfaces.ycp Wed Aug 31 16:28:04 2011 @@ -747,6 +747,7 @@ }); } }); + Deleted = []; /* Devices with chmod=0600 */ list<string> chmod = []; @@ -829,6 +830,14 @@ y2debug("CHANGED"); chmod = add(chmod, file); } + + if (OriginalDevices == nil) { + OriginalDevices = $[]; + } + if (OriginalDevices[typ]:nil == nil) { + OriginalDevices[typ] = $[]; + } + OriginalDevices[typ, config] = Devices[typ, config]:$[]; }); }); @@ -842,10 +851,6 @@ SCR::Execute(.target.bash, "/bin/chmod 0600 " + file); }); - // Deleted = []; - // OriginalDevices = Devices; - // Cannot do it because we have written only part of Devices. - // This module should be rewritten to objects. return true; } Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/… ============================================================================== --- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out (original) +++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out Wed Aug 31 16:28:04 2011 @@ -90,20 +90,6 @@ Return true Dump all=$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hippi": $["hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "vlan":$["eth0.3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "myvlantoo":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual", "VLAN_ID":"2"], "virtlan4":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "vlan3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"]]] Dump NetworkInterfaces::Write -Write .network.value."arc5".BOOTPROTO "dhcp" true -Write .network.value."arc5".STARTMODE "manual" true -Write .network.value."atm5".BOOTPROTO "dhcp" true -Write .network.value."atm5".STARTMODE "manual" true -Write .network.value."ci5".BOOTPROTO "dhcp" true -Write .network.value."ci5".STARTMODE "manual" true -Write .network.value."ctc5".BOOTPROTO "dhcp" true -Write .network.value."ctc5".STARTMODE "manual" true -Write .network.value."dummy5".BOOTPROTO "static" true -Write .network.value."dummy5".IPADDR "1.2.3.4/8" true -Write .network.value."dummy5".PREFIXLEN "8" true -Write .network.value."dummy5".STARTMODE "manual" true -Write .network.value."escon5".BOOTPROTO "dhcp" true -Write .network.value."escon5".STARTMODE "manual" true Write .network.value."eth5".BOOTPROTO "dhcp" true Write .network.value."eth5".STARTMODE "manual" true Write .network.value."eth6".BOOTPROTO "static" true @@ -120,14 +106,41 @@ Write .network.value."mynet0".BOOTPROTO "dhcp" true Write .network.value."mynet0".INTERFACETYPE "eth" true Write .network.value."mynet0".STARTMODE "auto" true +Write .network nil true +Return true +Write .network.value."ppp5".BOOTPROTO "dhcp" true +Write .network.value."ppp5".STARTMODE "manual" true +Write .network nil true +Return true +Write .network.value."ippp5".BOOTPROTO "dhcp" true +Write .network.value."ippp5".STARTMODE "manual" true +Write .network nil true +Return true +Return true +Write .network.value."atm5".BOOTPROTO "dhcp" true +Write .network.value."atm5".STARTMODE "manual" true +Write .network.value."tr5".BOOTPROTO "dhcp" true +Write .network.value."tr5".STARTMODE "manual" true +Write .network nil true +Return true +Write .network.value."arc5".BOOTPROTO "dhcp" true +Write .network.value."arc5".STARTMODE "manual" true +Write .network.value."ci5".BOOTPROTO "dhcp" true +Write .network.value."ci5".STARTMODE "manual" true +Write .network.value."ctc5".BOOTPROTO "dhcp" true +Write .network.value."ctc5".STARTMODE "manual" true +Write .network.value."dummy5".BOOTPROTO "static" true +Write .network.value."dummy5".IPADDR "1.2.3.4/8" true +Write .network.value."dummy5".PREFIXLEN "8" true +Write .network.value."dummy5".STARTMODE "manual" true +Write .network.value."escon5".BOOTPROTO "dhcp" true +Write .network.value."escon5".STARTMODE "manual" true Write .network.value."fddi5".BOOTPROTO "dhcp" true Write .network.value."fddi5".STARTMODE "manual" true Write .network.value."hippi5".BOOTPROTO "dhcp" true Write .network.value."hippi5".STARTMODE "manual" true Write .network.value."hsi5".BOOTPROTO "dhcp" true Write .network.value."hsi5".STARTMODE "manual" true -Write .network.value."ippp5".BOOTPROTO "dhcp" true -Write .network.value."ippp5".STARTMODE "manual" true Write .network.value."iucv5".BOOTPROTO "dhcp" true Write .network.value."iucv5".STARTMODE "manual" true Write .network.value."lo".BROADCAST "127.255.255.255" true @@ -137,10 +150,6 @@ Write .network.value."lo".STARTMODE "auto" true Write .network.value."myri5".BOOTPROTO "dhcp" true Write .network.value."myri5".STARTMODE "manual" true -Write .network.value."ppp5".BOOTPROTO "dhcp" true -Write .network.value."ppp5".STARTMODE "manual" true -Write .network.value."tr5".BOOTPROTO "dhcp" true -Write .network.value."tr5".STARTMODE "manual" true Write .network.value."eth0.3".BOOTPROTO "dhcp" true Write .network.value."eth0.3".ETHERDEVICE "eth0" true Write .network.value."eth0.3".STARTMODE "manual" true @@ -156,40 +165,6 @@ Write .network.value."vlan3".STARTMODE "manual" true Write .network nil true Return true -Write .network.value."eth5".BOOTPROTO "dhcp" true -Write .network.value."eth5".STARTMODE "manual" true -Write .network.value."eth6".BOOTPROTO "static" true -Write .network.value."eth6".IPADDR "1.2.3.4/32" true -Write .network.value."eth6".PREFIXLEN "32" true -Write .network.value."eth6".STARTMODE "manual" true -Write .network.value."eth7".STARTMODE "manual" true -Write .network.value."eth8".IPADDR "1.2.3.4/8" true -Write .network.value."eth8".PREFIXLEN "8" true -Write .network.value."eth8".STARTMODE "manual" true -Write .network.value."eth9".IPADDR "1.2.3.4/8" true -Write .network.value."eth9".PREFIXLEN "8" true -Write .network.value."eth9".STARTMODE "manual" true -Write .network.value."mynet0".BOOTPROTO "dhcp" true -Write .network.value."mynet0".INTERFACETYPE "eth" true -Write .network.value."mynet0".STARTMODE "auto" true -Write .network nil true -Return true -Write .network.value."ppp5".BOOTPROTO "dhcp" true -Write .network.value."ppp5".STARTMODE "manual" true -Write .network nil true -Return true -Write .network.value."ippp5".BOOTPROTO "dhcp" true -Write .network.value."ippp5".STARTMODE "manual" true -Write .network nil true -Return true -Write .network nil true -Return true -Write .network.value."atm5".BOOTPROTO "dhcp" true -Write .network.value."atm5".STARTMODE "manual" true -Write .network.value."tr5".BOOTPROTO "dhcp" true -Write .network.value."tr5".STARTMODE "manual" true -Write .network nil true -Return true Dump NetworkInterfaces::Export Dump exported=$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hi ppi":$["hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "vlan":$["eth0.3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "myvlantoo":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual", "VLAN_ID":"2"], "virtlan4":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "vlan3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"]]] Dump NetworkInterfaces::Import Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/… ============================================================================== --- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp (original) +++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp Wed Aug 31 16:28:04 2011 @@ -82,12 +82,12 @@ NetworkInterfaces::OriginalDevices = nil; DUMP("NetworkInterfaces::Write"); -TEST(``(NetworkInterfaces::Write("")), [READ], nil); TEST(``(NetworkInterfaces::Write("eth")), [READ], nil); TEST(``(NetworkInterfaces::Write("ppp")), [READ], nil); TEST(``(NetworkInterfaces::Write("ippp")), [READ], nil); TEST(``(NetworkInterfaces::Write("trx")), [READ], nil); TEST(``(NetworkInterfaces::Write("atm|tr")), [READ], nil); +TEST(``(NetworkInterfaces::Write("")), [READ], nil); map<string,map> exported = 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 Wed Aug 31 16:28:04 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Aug 31 16:21:31 CEST 2011 - mvidner(a)suse.cz + +- Update Deleted and OriginalDevices in NetworkInterfaces::Write. + Thanks to Justus Winter +- 2.21.14 + +------------------------------------------------------------------- Wed Aug 31 07:40:54 UTC 2011 - lslezak(a)suse.cz - fixed trusting a GPG key (wrong id check) (bnc#713068) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0