November 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r59755 - in /trunk/autoinstallation: package/autoyast2.changes src/include/autopart.ycp
by ug＠svn.opensuse.org 25 Nov '09

25 Nov '09

Author: ug Date: Wed Nov 25 14:38:48 2009 New Revision: 59755 URL: http://svn.opensuse.org/viewcvs/yast?rev=59755&view=rev Log: reusing of logical partitions can fail (bnc#557994) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/include/autopart.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Nov 25 14:38:48 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Nov 25 14:37:27 CET 2009 - ug(a)suse.de + +- reusing of logical partitions can fail (bnc#557994) + +------------------------------------------------------------------- Fri Nov 20 11:48:30 CET 2009 - ug(a)suse.de - fix for conflicts in rule-dialogs Modified: trunk/autoinstallation/src/include/autopart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/aut… ============================================================================== --- trunk/autoinstallation/src/include/autopart.ycp (original) +++ trunk/autoinstallation/src/include/autopart.ycp Wed Nov 25 14:38:48 2009 @@ -406,6 +406,8 @@ string mount = solution["partitions",pindex,"mount"]:""; // integer fsid = Partitions::fsid_native; integer fsid = disk["partitions",pindex,"fsid"]:Partitions::fsid_native; + if( disk["partitions",pindex,"type"]:`primary != `primary ) + fsid = disk["partitions",pindex+1,"fsid"]:Partitions::fsid_native; if( mount == "swap" ) { fsid = Partitions::fsid_swap; -- 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] <web-client> master : fix using proper default locale if langauge is not yet set (bnc#557767) (test is not included as I cannot find lang_helper test_suite)
by Josef Reidinger 25 Nov '09

25 Nov '09

ref: refs/heads/master commit 41d3ce7c2cc573f364d003d7cc814336e7ee0c08 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Wed Nov 25 12:54:36 2009 +0100 fix using proper default locale if langauge is not yet set (bnc#557767) (test is not included as I cannot find lang_helper test_suite) --- webclient/package/yast2-webclient.changes | 7 +++++++ webclient/package/yast2-webclient.spec | 2 +- .../vendor/plugins/lang_helper/lib/lang_helper.rb | 8 +++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index f41c7e0..f8b4ef8 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Nov 25 11:52:19 UTC 2009 - jreidinger(a)novell.com + +- fix using default language if language is not yet set + (bnc#557767) +- 0.0.23 + +------------------------------------------------------------------- Wed Nov 25 10:15:27 UTC 2009 - lslezak(a)suse.cz - yastwc init script - print the URL where the service is running diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec index 77b18af..143eb58 100644 --- a/webclient/package/yast2-webclient.spec +++ b/webclient/package/yast2-webclient.spec @@ -17,7 +17,7 @@ PreReq: rubygem-gettext_rails License: LGPL v2.1;ASLv2.0 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.22 +Version: 0.0.23 Release: 0 Summary: YaST2 - Webclient Source: www.tar.bz2 diff --git a/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb b/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb index f9c466b..c4ad1a7 100644 --- a/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb +++ b/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb @@ -29,7 +29,13 @@ module LangHelper end def current_locale - locale.language + ret = locale.language + Rails.logger.info ("detected locale #{ret}") + #find locale from existing one, translate if locale came from browser to current one, fallback to american english + default = lambda{return "en_US"} #detect require something which response to call + ret = I18n.supported_locales.detect(default) { |k| ret.tr('-','_').downcase == k.downcase ? k : nil} + Rails.logger.info ("returned locale #{ret}") + return ret end def language_name(code) -- 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] <web-client> backgroud_patches_bnc550934 : fix using proper default locale if langauge is not yet set (bnc#557767) (test is not included as I cannot find lang_helper test_suite)
by Josef Reidinger 25 Nov '09

25 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit 41d3ce7c2cc573f364d003d7cc814336e7ee0c08 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Wed Nov 25 12:54:36 2009 +0100 fix using proper default locale if langauge is not yet set (bnc#557767) (test is not included as I cannot find lang_helper test_suite) --- webclient/package/yast2-webclient.changes | 7 +++++++ webclient/package/yast2-webclient.spec | 2 +- .../vendor/plugins/lang_helper/lib/lang_helper.rb | 8 +++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index f41c7e0..f8b4ef8 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Nov 25 11:52:19 UTC 2009 - jreidinger(a)novell.com + +- fix using default language if language is not yet set + (bnc#557767) +- 0.0.23 + +------------------------------------------------------------------- Wed Nov 25 10:15:27 UTC 2009 - lslezak(a)suse.cz - yastwc init script - print the URL where the service is running diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec index 77b18af..143eb58 100644 --- a/webclient/package/yast2-webclient.spec +++ b/webclient/package/yast2-webclient.spec @@ -17,7 +17,7 @@ PreReq: rubygem-gettext_rails License: LGPL v2.1;ASLv2.0 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.22 +Version: 0.0.23 Release: 0 Summary: YaST2 - Webclient Source: www.tar.bz2 diff --git a/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb b/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb index f9c466b..c4ad1a7 100644 --- a/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb +++ b/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb @@ -29,7 +29,13 @@ module LangHelper end def current_locale - locale.language + ret = locale.language + Rails.logger.info ("detected locale #{ret}") + #find locale from existing one, translate if locale came from browser to current one, fallback to american english + default = lambda{return "en_US"} #detect require something which response to call + ret = I18n.supported_locales.detect(default) { |k| ret.tr('-','_').downcase == k.downcase ? k : nil} + Rails.logger.info ("returned locale #{ret}") + return ret end def language_name(code) -- 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] <rest-service> master : pushed version
by Stefan Schubert 25 Nov '09

25 Nov '09

ref: refs/heads/master commit 565f070d2d46d9d007e3936a5d2ab19fd283f638 Author: Stefan Schubert <schubi(a)suse.de> Date: Wed Nov 25 11:20:42 2009 +0100 pushed version --- .../status/package/yast2-webservice-status.changes | 1 + .../status/package/yast2-webservice-status.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/plugins/status/package/yast2-webservice-status.changes b/plugins/status/package/yast2-webservice-status.changes index 98c318a..e2449b7 100644 --- a/plugins/status/package/yast2-webservice-status.changes +++ b/plugins/status/package/yast2-webservice-status.changes @@ -2,6 +2,7 @@ Tue Nov 24 16:07:14 CET 2009 - schubi(a)suse.de - raising an exception if collectd is out of sync with the systemtime (#bnc555204) +- version 0.0.9 ------------------------------------------------------------------- Wed Nov 18 14:54:36 CET 2009 - bbrunner(a)suse.de diff --git a/plugins/status/package/yast2-webservice-status.spec b/plugins/status/package/yast2-webservice-status.spec index 8307480..a78e8d2 100644 --- a/plugins/status/package/yast2-webservice-status.spec +++ b/plugins/status/package/yast2-webservice-status.spec @@ -13,7 +13,7 @@ Name: yast2-webservice-status License: GPL v2 only Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.8 +Version: 0.0.9 Release: 0 Summary: YaST2 - Webservice - Status Source: www.tar.bz2 -- 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] <web-client> master : yastwc init script - print the URL where the service is running
by Ladislav Slezak 25 Nov '09

25 Nov '09

ref: refs/heads/master commit 25bea2627345c91f2e7fed163f3d807669666cd8 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Nov 25 11:19:15 2009 +0100 yastwc init script - print the URL where the service is running after start (bnc#554556) - 0.0.22 --- webclient/package/yast2-webclient.changes | 7 +++++++ webclient/package/yast2-webclient.spec | 2 +- webclient/package/yastwc | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index 0f9db2e..f41c7e0 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Nov 25 10:15:27 UTC 2009 - lslezak(a)suse.cz + +- yastwc init script - print the URL where the service is running + after start (bnc#554556) +- 0.0.22 + +------------------------------------------------------------------- Tue Nov 24 16:03:39 CET 2009 - jdsn(a)suse.de - set organization and unit name in SSL certificate (bnc#557761) diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec index e56d4bf..77b18af 100644 --- a/webclient/package/yast2-webclient.spec +++ b/webclient/package/yast2-webclient.spec @@ -17,7 +17,7 @@ PreReq: rubygem-gettext_rails License: LGPL v2.1;ASLv2.0 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.21 +Version: 0.0.22 Release: 0 Summary: YaST2 - Webclient Source: www.tar.bz2 diff --git a/webclient/package/yastwc b/webclient/package/yastwc index a1ecf25..164dcfa 100755 --- a/webclient/package/yastwc +++ b/webclient/package/yastwc @@ -194,6 +194,12 @@ case "$1" in # Remember status and be verbose rc_status -v + + # print the URL of the server + if test "$?" -eq 0; then + echo -e "\t${done}The WebYaST client service is running at https://"`LC_ALL=C ifconfig eth0 | grep "inet addr" | cut -d ":" -f 2 | cut -d " " -f 1`":54984/${norm}\n" + fi + ;; stop) echo -n "Shutting down yastwc " -- 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] <web-client> backgroud_patches_bnc550934 : yastwc init script - print the URL where the service is running
by Ladislav Slezak 25 Nov '09

25 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit 25bea2627345c91f2e7fed163f3d807669666cd8 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Nov 25 11:19:15 2009 +0100 yastwc init script - print the URL where the service is running after start (bnc#554556) - 0.0.22 --- webclient/package/yast2-webclient.changes | 7 +++++++ webclient/package/yast2-webclient.spec | 2 +- webclient/package/yastwc | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index 0f9db2e..f41c7e0 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Nov 25 10:15:27 UTC 2009 - lslezak(a)suse.cz + +- yastwc init script - print the URL where the service is running + after start (bnc#554556) +- 0.0.22 + +------------------------------------------------------------------- Tue Nov 24 16:03:39 CET 2009 - jdsn(a)suse.de - set organization and unit name in SSL certificate (bnc#557761) diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec index e56d4bf..77b18af 100644 --- a/webclient/package/yast2-webclient.spec +++ b/webclient/package/yast2-webclient.spec @@ -17,7 +17,7 @@ PreReq: rubygem-gettext_rails License: LGPL v2.1;ASLv2.0 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.21 +Version: 0.0.22 Release: 0 Summary: YaST2 - Webclient Source: www.tar.bz2 diff --git a/webclient/package/yastwc b/webclient/package/yastwc index a1ecf25..164dcfa 100755 --- a/webclient/package/yastwc +++ b/webclient/package/yastwc @@ -194,6 +194,12 @@ case "$1" in # Remember status and be verbose rc_status -v + + # print the URL of the server + if test "$?" -eq 0; then + echo -e "\t${done}The WebYaST client service is running at https://"`LC_ALL=C ifconfig eth0 | grep "inet addr" | cut -d ":" -f 2 | cut -d " " -f 1`":54984/${norm}\n" + fi + ;; stop) echo -n "Shutting down yastwc " -- 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] <web-client> master : pushed version
by Stefan Schubert 25 Nov '09

25 Nov '09

ref: refs/heads/master commit 1f7546770171ed374695a7f626d63181636c8b9a Author: Stefan Schubert <schubi(a)suse.de> Date: Wed Nov 25 11:10:19 2009 +0100 pushed version --- .../status/package/yast2-webclient-status.changes | 1 + plugins/status/package/yast2-webclient-status.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/plugins/status/package/yast2-webclient-status.changes b/plugins/status/package/yast2-webclient-status.changes index 0843861..159da8d 100644 --- a/plugins/status/package/yast2-webclient-status.changes +++ b/plugins/status/package/yast2-webclient-status.changes @@ -2,6 +2,7 @@ Tue Nov 24 16:10:22 CET 2009 - schubi(a)suse.de - catch exception COLLECTD_SYNC_ERROR and show it user (#bnc555204) +- version 0.0.13 ------------------------------------------------------------------- Tue Nov 24 11:37:57 CET 2009 - kkaempf(a)suse.de diff --git a/plugins/status/package/yast2-webclient-status.spec b/plugins/status/package/yast2-webclient-status.spec index 49bfc0c..5c59ad7 100644 --- a/plugins/status/package/yast2-webclient-status.spec +++ b/plugins/status/package/yast2-webclient-status.spec @@ -14,7 +14,7 @@ PreReq: yast2-webclient >= 0.0.2 License: GPL v2 only Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.12 +Version: 0.0.13 Release: 0 Summary: YaST2 - Webclient - status Source: www.tar.bz2 -- 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] <web-client> backgroud_patches_bnc550934 : pushed version
by Stefan Schubert 25 Nov '09

25 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit 1f7546770171ed374695a7f626d63181636c8b9a Author: Stefan Schubert <schubi(a)suse.de> Date: Wed Nov 25 11:10:19 2009 +0100 pushed version --- .../status/package/yast2-webclient-status.changes | 1 + plugins/status/package/yast2-webclient-status.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/plugins/status/package/yast2-webclient-status.changes b/plugins/status/package/yast2-webclient-status.changes index 0843861..159da8d 100644 --- a/plugins/status/package/yast2-webclient-status.changes +++ b/plugins/status/package/yast2-webclient-status.changes @@ -2,6 +2,7 @@ Tue Nov 24 16:10:22 CET 2009 - schubi(a)suse.de - catch exception COLLECTD_SYNC_ERROR and show it user (#bnc555204) +- version 0.0.13 ------------------------------------------------------------------- Tue Nov 24 11:37:57 CET 2009 - kkaempf(a)suse.de diff --git a/plugins/status/package/yast2-webclient-status.spec b/plugins/status/package/yast2-webclient-status.spec index 49bfc0c..5c59ad7 100644 --- a/plugins/status/package/yast2-webclient-status.spec +++ b/plugins/status/package/yast2-webclient-status.spec @@ -14,7 +14,7 @@ PreReq: yast2-webclient >= 0.0.2 License: GPL v2 only Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.12 +Version: 0.0.13 Release: 0 Summary: YaST2 - Webclient - status Source: www.tar.bz2 -- 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] r59754 - /tags/branch-SLE-10-SP3-2_13_24/dns-server/
by locilka＠svn.opensuse.org 25 Nov '09

25 Nov '09

Author: locilka Date: Wed Nov 25 10:41:13 2009 New Revision: 59754 URL: http://svn.opensuse.org/viewcvs/yast?rev=59754&view=rev Log: Created tag branch-SLE-10-SP3-2_13_24 for dns-server Added: tags/branch-SLE-10-SP3-2_13_24/dns-server/ - copied from r59753, branches/SuSE-SLE-10-SP3-Branch/dns-server/ -- 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] r59753 - in /branches/SuSE-SLE-10-SP3-Branch/dns-server: VERSION agents/ag_convert_named_conf package/yast2-dns-server.changes src/DnsZones.pm
by locilka＠svn.opensuse.org 25 Nov '09

25 Nov '09

Author: locilka Date: Wed Nov 25 10:40:16 2009 New Revision: 59753 URL: http://svn.opensuse.org/viewcvs/yast?rev=59753&view=rev Log: - Enhanced agent for transforming user-defined named.conf to understand zone definition without 'in' (#266717). - DNS zones need a FQDN hostname, using /etc/HOSTNAME as a fallback when hostname --fqdn returns empty string (bnc #403468). - 2.13.24 Modified: branches/SuSE-SLE-10-SP3-Branch/dns-server/VERSION branches/SuSE-SLE-10-SP3-Branch/dns-server/agents/ag_convert_named_conf branches/SuSE-SLE-10-SP3-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-SLE-10-SP3-Branch/dns-server/src/DnsZones.pm Modified: branches/SuSE-SLE-10-SP3-Branch/dns-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/dns-se… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/dns-server/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/dns-server/VERSION Wed Nov 25 10:40:16 2009 @@ -1 +1 @@ -2.13.23 +2.13.24 Modified: branches/SuSE-SLE-10-SP3-Branch/dns-server/agents/ag_convert_named_conf URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/dns-se… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/dns-server/agents/ag_convert_named_conf (original) +++ branches/SuSE-SLE-10-SP3-Branch/dns-server/agents/ag_convert_named_conf Wed Nov 25 10:40:16 2009 @@ -24,7 +24,8 @@ # convert the file content to the IniAgent-understandable format $file_content =~ s/(options|view|logging)[ \t\n]*\{/$1 {/g; - $file_content =~ s/(zone)[ \t\n]*([^ \t\n]+)[ \t\n]*([^ \t\n]+)[ \t\n]*\{/$1 $2 $3 {/g; + # zone "zone.name" in { ("in" is not necessary) + $file_content =~ s/(zone)[ \t\n]*([^ \t\n]+)([ \t\n]+in)?[ \t\n]*\{/$1 $2 in {/gi; if ($file_content ne $file_content_backup) { my $backup_file = $file.'.YaST-backup'; Modified: branches/SuSE-SLE-10-SP3-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/dns-se… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/dns-server/package/yast2-dns-server.changes Wed Nov 25 10:40:16 2009 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Nov 25 10:34:29 CET 2009 - locilka(a)suse.cz + +- Enhanced agent for transforming user-defined named.conf to + understand zone definition without 'in' (#266717). +- DNS zones need a FQDN hostname, using /etc/HOSTNAME as a fallback + when hostname --fqdn returns empty string (bnc #403468). +- 2.13.24 + +------------------------------------------------------------------- Tue Jan 16 13:05:47 CET 2007 - locilka(a)suse.cz - Adding X-SuSE-YaST-AutoInstSchema entry into the application Modified: branches/SuSE-SLE-10-SP3-Branch/dns-server/src/DnsZones.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/dns-se… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/dns-server/src/DnsZones.pm (original) +++ branches/SuSE-SLE-10-SP3-Branch/dns-server/src/DnsZones.pm Wed Nov 25 10:40:16 2009 @@ -55,13 +55,25 @@ my $self = shift; my $out = SCR->Execute (".target.bash_output", "/bin/hostname --fqdn"); - if ($out->{"exit"} ne 0) - { - return "@"; + + if (Mode->test()) { + return ""; + } + + # standard return + if ($out->{"exit"} eq "0") { + my $stdout = $out->{"stdout"}; + my ($ret, $rest) = split ("\n", $stdout, 2); + + return $ret; + # fallback + } else { + my $hostname = SCR->Read (".target.string", "/etc/HOSTNAME"); + my ($ret, $rest) = split ("\n", $hostname, 2); + y2warning ("Using fallback hostname: ".$ret); + + return $ret; } - my $stdout = $out->{"stdout"}; - my ($ret, $rest) = split ("\n", $stdout, 2); - return $ret; } BEGIN { $TYPEINFO{AbsoluteZoneFileName} = ["function", "string", "string" ]; } @@ -126,7 +138,11 @@ sub GetDefaultSOA { my $self = shift; - my $fqdn = $self->GetFQDN (); + my $fqdn = $self->GetFQDN(); + if ($fqdn eq "") { + $fqdn = "linux.site"; + } + $fqdn = "$fqdn."; my $adm_mail = "root.$fqdn"; my %soa = ( -- 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] <rest-service> master : added testcase
by Stefan Schubert 25 Nov '09

25 Nov '09

ref: refs/heads/master commit 2aede31036233d6d70f4ae2bd3485b10a8529f6c Author: Stefan Schubert <schubi(a)suse.de> Date: Wed Nov 25 09:53:12 2009 +0100 added testcase --- plugins/status/lib/status.rb | 7 ++++++- plugins/status/test/unit/status_test.rb | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb index 07a52f8..9c661fe 100644 --- a/plugins/status/lib/status.rb +++ b/plugins/status/lib/status.rb @@ -199,13 +199,18 @@ class Status return @data end + #get last entry of rrd database + def last_db_entry(file) + `/bin/sh -c "LC_ALL=C rrdtool last #{file}"` + end + # runs the rddtool on file with start time and end time # default last 5 minutes from now def run_rrdtool(file, start, stop) #checking if systemtime is BEHIND the last entry of collectd. #If yes, no data will be available. - timestamp = `/bin/sh -c "LC_ALL=C rrdtool last #{file}"` + timestamp = last_db_entry(file) raise CollectdOutOfSyncError.new(timestamp) if Time.now < Time.at(timestamp.to_i) stop = Time.now if stop.nil? diff --git a/plugins/status/test/unit/status_test.rb b/plugins/status/test/unit/status_test.rb index 96b64f3..b04794b 100644 --- a/plugins/status/test/unit/status_test.rb +++ b/plugins/status/test/unit/status_test.rb @@ -118,4 +118,20 @@ EOF assert_equal expected_response, status.fetch_metric("/var/lib/collectd/test/memory-free.rrd", start, stop) end + + def test_db_out_of_sync + stop = Time.now + start = Time.now - 300 + + status = Status.new + + # stub the checking db for last entry + status.stubs(:last_db_entry).with("/var/lib/collectd/test/memory-free.rrd").returns("1248092090") + Time.stubs(:now).returns(Time.at(1248000000)) + + assert_raise CollectdOutOfSyncError do + ret = status.fetch_metric("/var/lib/collectd/test/memory-free.rrd", start, stop) + end + end + end -- 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] r59752 - /tags/branch-Code-11-SP1-2_17_31/users/
by jsuchome＠svn.opensuse.org 25 Nov '09

25 Nov '09

Author: jsuchome Date: Wed Nov 25 09:21:02 2009 New Revision: 59752 URL: http://svn.opensuse.org/viewcvs/yast?rev=59752&view=rev Log: Created tag branch-Code-11-SP1-2_17_31 for users Added: tags/branch-Code-11-SP1-2_17_31/users/ (props changed) - copied from r59751, branches/SuSE-Code-11-SP1-Branch/users/ -- 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] r59751 - in /branches/SuSE-Code-11-SP1-Branch/users: VERSION package/yast2-users.changes src/dialogs.ycp
by jsuchome＠svn.opensuse.org 25 Nov '09

25 Nov '09

Author: jsuchome Date: Wed Nov 25 09:20:57 2009 New Revision: 59751 URL: http://svn.opensuse.org/viewcvs/yast?rev=59751&view=rev Log: - fixed syntax error in dialogs.ycp (bnc#557786) - 2.17.31 Modified: branches/SuSE-Code-11-SP1-Branch/users/VERSION branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes branches/SuSE-Code-11-SP1-Branch/users/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP1-Branch/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/users/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/users/VERSION Wed Nov 25 09:20:57 2009 @@ -1 +1 @@ -2.17.30 +2.17.31 Modified: branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes Wed Nov 25 09:20:57 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 25 09:12:08 CET 2009 - jsuchome(a)suse.cz + +- fixed syntax error in dialogs.ycp (bnc#557786) +- 2.17.31 + +------------------------------------------------------------------- Tue Oct 27 14:27:56 CET 2009 - jsuchome(a)suse.cz - in firstboot, allow "Use this password for root" check box Modified: branches/SuSE-Code-11-SP1-Branch/users/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/users/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/users/src/dialogs.ycp Wed Nov 25 09:20:57 2009 @@ -395,7 +395,7 @@ optionbox = add (optionbox, `Left (`CheckBox (`id (`root_pw), // checkbox label - _("U&se this password for system administrator"), root_pw, root_pw_feature) + _("U&se this password for system administrator"), root_pw_feature == true) )); } else if (!do_not_edit && !installation ()) -- 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] <web-client> master : fix jquery selector for date picker (bnc#558068)
by Josef Reidinger 25 Nov '09

25 Nov '09

ref: refs/heads/master commit b89c1107a647f1f972dcd836e5a719e2aa9f4b22 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Wed Nov 25 08:23:04 2009 +0100 fix jquery selector for date picker (bnc#558068) --- .../systemtime/app/views/systemtime/index.rhtml | 2 +- .../package/yast2-webclient-systemtime.changes | 6 ++++++ .../package/yast2-webclient-systemtime.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/systemtime/app/views/systemtime/index.rhtml b/plugins/systemtime/app/views/systemtime/index.rhtml index a13dbbb..369899c 100644 --- a/plugins/systemtime/app/views/systemtime/index.rhtml +++ b/plugins/systemtime/app/views/systemtime/index.rhtml @@ -7,7 +7,7 @@ <% javascript_tag do -%> $(document).ready( function() { - $(".datepicker").datepicker( { dateFormat: 'dd/mm/yy'} ); + $("#date_date").datepicker( { dateFormat: 'dd/mm/yy'} ); }); <% end -%> diff --git a/plugins/systemtime/package/yast2-webclient-systemtime.changes b/plugins/systemtime/package/yast2-webclient-systemtime.changes index 805aefa..650cd2a 100644 --- a/plugins/systemtime/package/yast2-webclient-systemtime.changes +++ b/plugins/systemtime/package/yast2-webclient-systemtime.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 25 07:12:41 UTC 2009 - jreidinger(a)novell.com + +- fix datepicker jquery selector (bnc#558068) +- 0.0.14 + +------------------------------------------------------------------- Mon Nov 23 10:17:40 UTC 2009 - jreidinger(a)novell.com - force setting hardware clock to UTC only if used NTP (bnc#557205) diff --git a/plugins/systemtime/package/yast2-webclient-systemtime.spec b/plugins/systemtime/package/yast2-webclient-systemtime.spec index d4a535a..c40d82f 100644 --- a/plugins/systemtime/package/yast2-webclient-systemtime.spec +++ b/plugins/systemtime/package/yast2-webclient-systemtime.spec @@ -14,7 +14,7 @@ PreReq: yast2-webclient >= 0.0.2 License: GPL v2 only Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.13 +Version: 0.0.14 Release: 0 Summary: YaST2 - Webclient - SystemTime Source: www.tar.bz2 -- 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] <web-client> backgroud_patches_bnc550934 : fix jquery selector for date picker (bnc#558068)
by Josef Reidinger 25 Nov '09

25 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit b89c1107a647f1f972dcd836e5a719e2aa9f4b22 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Wed Nov 25 08:23:04 2009 +0100 fix jquery selector for date picker (bnc#558068) --- .../systemtime/app/views/systemtime/index.rhtml | 2 +- .../package/yast2-webclient-systemtime.changes | 6 ++++++ .../package/yast2-webclient-systemtime.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/systemtime/app/views/systemtime/index.rhtml b/plugins/systemtime/app/views/systemtime/index.rhtml index a13dbbb..369899c 100644 --- a/plugins/systemtime/app/views/systemtime/index.rhtml +++ b/plugins/systemtime/app/views/systemtime/index.rhtml @@ -7,7 +7,7 @@ <% javascript_tag do -%> $(document).ready( function() { - $(".datepicker").datepicker( { dateFormat: 'dd/mm/yy'} ); + $("#date_date").datepicker( { dateFormat: 'dd/mm/yy'} ); }); <% end -%> diff --git a/plugins/systemtime/package/yast2-webclient-systemtime.changes b/plugins/systemtime/package/yast2-webclient-systemtime.changes index 805aefa..650cd2a 100644 --- a/plugins/systemtime/package/yast2-webclient-systemtime.changes +++ b/plugins/systemtime/package/yast2-webclient-systemtime.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 25 07:12:41 UTC 2009 - jreidinger(a)novell.com + +- fix datepicker jquery selector (bnc#558068) +- 0.0.14 + +------------------------------------------------------------------- Mon Nov 23 10:17:40 UTC 2009 - jreidinger(a)novell.com - force setting hardware clock to UTC only if used NTP (bnc#557205) diff --git a/plugins/systemtime/package/yast2-webclient-systemtime.spec b/plugins/systemtime/package/yast2-webclient-systemtime.spec index d4a535a..c40d82f 100644 --- a/plugins/systemtime/package/yast2-webclient-systemtime.spec +++ b/plugins/systemtime/package/yast2-webclient-systemtime.spec @@ -14,7 +14,7 @@ PreReq: yast2-webclient >= 0.0.2 License: GPL v2 only Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.13 +Version: 0.0.14 Release: 0 Summary: YaST2 - Webclient - SystemTime Source: www.tar.bz2 -- 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] r59750 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: rhafer Date: Tue Nov 24 17:54:08 2009 New Revision: 59750 URL: http://svn.opensuse.org/viewcvs/yast?rev=59750&view=rev Log: Updated changelog Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Tue Nov 24 17:54:08 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Nov 24 16:51:31 UTC 2009 - rhafer(a)novell.com + +- fixed installation proposal for syncrepl slave setups + (bnc558019) +- added a workaround to avoid slapd restart problems after + configurations changes that required a restart (bnc#558059) + +------------------------------------------------------------------- Tue Nov 17 14:32:13 UTC 2009 - rhafer(a)novell.com - Version 2.17.23: -- 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] r59749 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp
by rhafer＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: rhafer Date: Tue Nov 24 17:54:06 2009 New Revision: 59749 URL: http://svn.opensuse.org/viewcvs/yast?rev=59749&view=rev Log: Workaround for slapd start failure (bnc#558059) Just rewrite the existing objectclass attribute instead of adding a new one. This is just a workaround the real bug seems to be in OpenLDAP. Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp Tue Nov 24 17:54:06 2009 @@ -2076,7 +2076,7 @@ void OlcConfig::waitForBackgroundTasks() { try { - LDAPModification mod( LDAPAttribute("objectClass", "olcConfig"), LDAPModification::OP_ADD ); + LDAPModification mod( LDAPAttribute("objectClass", "olcGlobal"), LDAPModification::OP_ADD ); LDAPModList ml; ml.addModification(mod); m_lc->modify( "cn=config", &ml ); -- 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] r59748 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp
by rhafer＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: rhafer Date: Tue Nov 24 17:54:02 2009 New Revision: 59748 URL: http://svn.opensuse.org/viewcvs/yast?rev=59748&view=rev Log: Ignore missing root password in slave setup More for bnc#558019 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp Tue Nov 24 17:54:02 2009 @@ -87,17 +87,20 @@ { string rootPWString = ""; defaults = LdapServer::ReadInitialDefaults(); - if( defaults["rootpw_clear"]:"" == Users::GetRootPassword() ) + if (! LdapServer::ReadSetupSlave() ) { - rootPWString = _("[root password]"); - } else - { - rootPWString = _("[manually set]"); - } - if( defaults["rootpw_clear"]:"" == "" ) - { - warning = _("Unable to retrieve the system root password. Set an LDAP server password to continue."); - warning_level = `blocker; + if( defaults["rootpw_clear"]:"" == Users::GetRootPassword() ) + { + rootPWString = _("[root password]"); + } else + { + rootPWString = _("[manually set]"); + } + if( defaults["rootpw_clear"]:"" == "" ) + { + warning = _("Unable to retrieve the system root password. Set an LDAP server password to continue."); + warning_level = `blocker; + } } // Try to get Firewall status string fw_text = ""; -- 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] r59747 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server/src: LdapServer.pm dialogs.ycp ldap-server_proposal.ycp
by rhafer＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: rhafer Date: Tue Nov 24 17:53:59 2009 New Revision: 59747 URL: http://svn.opensuse.org/viewcvs/yast?rev=59747&view=rev Log: Fixed slave setup in install proposal (bnc#558019) Moved slave initialization into ReadFromDefaults() to avoid overwriting in during installation proposal and to be more consistent with master/standalone setup. Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm Tue Nov 24 17:53:59 2009 @@ -1672,121 +1672,132 @@ my $frontenddb = { 'type' => 'frontend' }; $self->InitGlobals(); - SCR->Execute('.ldapserver.initSchema' ); - my $rc = SCR->Write(".ldapserver.schema.addFromLdif", "/etc/openldap/schema/core.ldif" ); - if ( ! $rc ) { - my $err = SCR->Error(".ldapserver"); - y2error("Adding Schema failed: ".$err->{'summary'}." ".$err->{'description'}); - $self->SetError( $err->{'summary'}, $err->{'description'} ); - return $rc; - } - $rc = SCR->Write(".ldapserver.schema.addFromLdif", "/etc/openldap/schema/cosine.ldif" ); - if ( ! $rc ) { - my $err = SCR->Error(".ldapserver"); - y2error("Adding Schema failed: ".$err->{'summary'}." ".$err->{'description'}); - $self->SetError( $err->{'summary'}, $err->{'description'} ); - return $rc; - } - $rc = SCR->Write(".ldapserver.schema.addFromLdif", "/etc/openldap/schema/inetorgperson.ldif" ); - if ( ! $rc ) { - my $err = SCR->Error(".ldapserver"); - y2error("Adding Schema failed: ".$err->{'summary'}." ".$err->{'description'}); - $self->SetError( $err->{'summary'}, $err->{'description'} ); - return $rc; - } - $rc = SCR->Write(".ldapserver.schema.addFromSchemafile", "/etc/openldap/schema/rfc2307bis.schema" ); - if ( ! $rc ) { - my $err = SCR->Error(".ldapserver"); - y2error("Adding Schema failed: ".$err->{'summary'}." ".$err->{'description'}); - $self->SetError( $err->{'summary'}, $err->{'description'} ); - return $rc; - } - $rc = SCR->Write(".ldapserver.schema.addFromSchemafile", "/etc/openldap/schema/yast.schema" ); - if ( ! $rc ) { - my $err = SCR->Error(".ldapserver"); - y2error("Adding Schema failed: ".$err->{'summary'}." ".$err->{'description'}); - $self->SetError( $err->{'summary'}, $err->{'description'} ); - return $rc; - } - - SCR->Execute('.ldapserver.initDatabases', [ $frontenddb, $cfgdatabase, $database ] ); - if ( $dbDefaults{'defaultIndex'} == 1 || - ( ref($dbDefaults{'defaultIndex'}) eq "YaST::YCP::Boolean" && - $dbDefaults{'defaultIndex'}->value == 1 ) - ) + + if ( $self->ReadSetupSlave() ) { - foreach my $idx ( @$defaultIndexes ) + SCR->Execute('.ldapserver.initDatabases', [ $frontenddb, $cfgdatabase ] ); + SCR->Write(".ldapserver.database.{0}.syncrepl", $syncreplbaseconfig ); + my $ldif = SCR->Read('.ldapserver.configAsLdif' ); + y2debug($ldif); + } + else #master or standalone + { + SCR->Execute('.ldapserver.initSchema' ); + my $rc = SCR->Write(".ldapserver.schema.addFromLdif", "/etc/openldap/schema/core.ldif" ); + if ( ! $rc ) { + my $err = SCR->Error(".ldapserver"); + y2error("Adding Schema failed: ".$err->{'summary'}." ".$err->{'description'}); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + return $rc; + } + $rc = SCR->Write(".ldapserver.schema.addFromLdif", "/etc/openldap/schema/cosine.ldif" ); + if ( ! $rc ) { + my $err = SCR->Error(".ldapserver"); + y2error("Adding Schema failed: ".$err->{'summary'}." ".$err->{'description'}); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + return $rc; + } + $rc = SCR->Write(".ldapserver.schema.addFromLdif", "/etc/openldap/schema/inetorgperson.ldif" ); + if ( ! $rc ) { + my $err = SCR->Error(".ldapserver"); + y2error("Adding Schema failed: ".$err->{'summary'}." ".$err->{'description'}); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + return $rc; + } + $rc = SCR->Write(".ldapserver.schema.addFromSchemafile", "/etc/openldap/schema/rfc2307bis.schema" ); + if ( ! $rc ) { + my $err = SCR->Error(".ldapserver"); + y2error("Adding Schema failed: ".$err->{'summary'}." ".$err->{'description'}); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + return $rc; + } + $rc = SCR->Write(".ldapserver.schema.addFromSchemafile", "/etc/openldap/schema/yast.schema" ); + if ( ! $rc ) { + my $err = SCR->Error(".ldapserver"); + y2error("Adding Schema failed: ".$err->{'summary'}." ".$err->{'description'}); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + return $rc; + } + + SCR->Execute('.ldapserver.initDatabases', [ $frontenddb, $cfgdatabase, $database ] ); + if ( $dbDefaults{'defaultIndex'} == 1 || + ( ref($dbDefaults{'defaultIndex'}) eq "YaST::YCP::Boolean" && + $dbDefaults{'defaultIndex'}->value == 1 ) + ) { - $self->ChangeDatabaseIndex(1, $idx ); + foreach my $idx ( @$defaultIndexes ) + { + $self->ChangeDatabaseIndex(1, $idx ); + } } - } - if ( defined $dbDefaults{'configpw'} && $dbDefaults{'configpw'} ne "" ) - { - my $confPwHash = $self->HashPassword($dbDefaults{'pwenctype'}, $dbDefaults{'configpw'} ); - my $changes = { "secure_only" => 1, "rootpw" => $confPwHash }; - $self->UpdateDatabase(0 ,$changes); - if ( $self->ReadSetupMaster() ) + if ( defined $dbDefaults{'configpw'} && $dbDefaults{'configpw'} ne "" ) { - my $syncprov = { 'enabled' => 1, - 'checkpoint' => { 'ops' => YaST::YCP::Integer(100), - 'min' => YaST::YCP::Integer(10) } - }; - - SCR->Write( ".ldapserver.database.{0}.syncprov", $syncprov ); - SCR->Write( ".ldapserver.database.{1}.syncprov", $syncprov ); - - my $syncpw = GenerateRandPassword(); - my $syncdn = "uid=syncrepl,ou=system,".$dbDefaults{'suffix'}; - my $rc = SCR->Execute( '.target.bash_output', "/bin/hostname -f" ); - my $fqdn = $rc->{"stdout"}; - chomp($fqdn); - my $syncrepl = { - "provider" => { - "protocol" => "ldap", - "target" => $fqdn, - "port" => YaST::YCP::Integer(389) - }, - "type" => "refreshAndPersist", - "binddn" => $syncdn, - "credentials" => $syncpw, - "basedn" => "cn=config", - "starttls" => YaST::YCP::Boolean(1), - "updateref" => {} - }; - SCR->Write(".ldapserver.database.{0}.syncrepl", $syncrepl ); - $syncrepl->{'basedn'} = $dbDefaults{'suffix'}; - SCR->Write(".ldapserver.database.{1}.syncrepl", $syncrepl ); - $syncreplaccount->{'syncdn'} = $syncdn; - $syncreplaccount->{'syncpw'} = $syncpw; - $syncreplaccount->{'syncpw_hash'} = $self->HashPassword($dbDefaults{'pwenctype'}, $syncpw ); - $syncreplaccount->{'basedn'} = $dbDefaults{'suffix'}; - my @syncacl = ({ - 'target' => {}, - 'access' => [ - { 'type' => "dn.base", - 'value' => $syncdn, - 'level' => "read", - 'control' => "" }, - { 'type' => "*", - 'value' => "", - 'level' => "", - 'control' => "break" } - ] - }); - $rc = SCR->Write(".ldapserver.database.{0}.acl", \@syncacl ); - push @syncacl, @$defaultDbAcls; - $defaultDbAcls = \@syncacl; + my $confPwHash = $self->HashPassword($dbDefaults{'pwenctype'}, $dbDefaults{'configpw'} ); + my $changes = { "secure_only" => 1, "rootpw" => $confPwHash }; + $self->UpdateDatabase(0 ,$changes); + if ( $self->ReadSetupMaster() ) + { + my $syncprov = { 'enabled' => 1, + 'checkpoint' => { 'ops' => YaST::YCP::Integer(100), + 'min' => YaST::YCP::Integer(10) } + }; + + SCR->Write( ".ldapserver.database.{0}.syncprov", $syncprov ); + SCR->Write( ".ldapserver.database.{1}.syncprov", $syncprov ); + + my $syncpw = GenerateRandPassword(); + my $syncdn = "uid=syncrepl,ou=system,".$dbDefaults{'suffix'}; + my $rc = SCR->Execute( '.target.bash_output', "/bin/hostname -f" ); + my $fqdn = $rc->{"stdout"}; + chomp($fqdn); + my $syncrepl = { + "provider" => { + "protocol" => "ldap", + "target" => $fqdn, + "port" => YaST::YCP::Integer(389) + }, + "type" => "refreshAndPersist", + "binddn" => $syncdn, + "credentials" => $syncpw, + "basedn" => "cn=config", + "starttls" => YaST::YCP::Boolean(1), + "updateref" => {} + }; + SCR->Write(".ldapserver.database.{0}.syncrepl", $syncrepl ); + $syncrepl->{'basedn'} = $dbDefaults{'suffix'}; + SCR->Write(".ldapserver.database.{1}.syncrepl", $syncrepl ); + $syncreplaccount->{'syncdn'} = $syncdn; + $syncreplaccount->{'syncpw'} = $syncpw; + $syncreplaccount->{'syncpw_hash'} = $self->HashPassword($dbDefaults{'pwenctype'}, $syncpw ); + $syncreplaccount->{'basedn'} = $dbDefaults{'suffix'}; + my @syncacl = ({ + 'target' => {}, + 'access' => [ + { 'type' => "dn.base", + 'value' => $syncdn, + 'level' => "read", + 'control' => "" }, + { 'type' => "*", + 'value' => "", + 'level' => "", + 'control' => "break" } + ] + }); + $rc = SCR->Write(".ldapserver.database.{0}.acl", \@syncacl ); + push @syncacl, @$defaultDbAcls; + $defaultDbAcls = \@syncacl; + } } + + # add default ACLs + $rc = SCR->Write(".ldapserver.database.{-1}.acl", $defaultGlobalAcls ); + $rc = SCR->Write(".ldapserver.database.{1}.acl", $defaultDbAcls ); + push @added_databases, $dbDefaults{'suffix'}; + $self->WriteAuthInfo( $dbDefaults{'suffix'}, + { bind_dn => $dbDefaults{'rootdn'}, + bind_pw => $dbDefaults{'rootpw_clear'} } ); } - - # add default ACLs - $rc = SCR->Write(".ldapserver.database.{-1}.acl", $defaultGlobalAcls ); - $rc = SCR->Write(".ldapserver.database.{1}.acl", $defaultDbAcls ); - push @added_databases, $dbDefaults{'suffix'}; - $self->WriteAuthInfo( $dbDefaults{'suffix'}, - { bind_dn => $dbDefaults{'rootdn'}, - bind_pw => $dbDefaults{'rootpw_clear'} } ); $usingDefaults = 0; $readConfig = 1; return 1; @@ -2826,22 +2837,10 @@ SCR->Execute(".ldapserver.reset" ); $self->CreateSyncReplAccount(); - SCR->Execute(".ldapserver.initGlobals" ); - my $cfgdatabase = { 'type' => 'config', - 'rootdn' => 'cn=config' }; - my $frontenddb = { 'type' => 'frontend' }; - SCR->Execute('.ldapserver.initDatabases', [ $frontenddb, $cfgdatabase ] ); $syncreplbaseconfig->{'binddn'} = "cn=config"; $syncreplbaseconfig->{'credentials'} = $auth_info->{'cn=config'}->{'bind_pw'}; $syncreplbaseconfig->{'basedn'} = "cn=config"; - SCR->Write(".ldapserver.database.{0}.syncrepl", $syncreplbaseconfig ); - my $ldif = SCR->Read('.ldapserver.configAsLdif' ); - y2milestone($ldif); - $overwriteConfig = 1; -# $self->Write( {resetCsn => 1} ); -# SCR->Execute(".ldapserver.reset" ); - return 1; } Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp Tue Nov 24 17:53:59 2009 @@ -1011,6 +1011,7 @@ any ret = nil; LdapServer::SetupRemoteForReplication(); + LdapServer::ReadFromDefaults(); ret = `next; return ret; } Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp Tue Nov 24 17:53:59 2009 @@ -213,6 +213,7 @@ return ret; } + if ( LdapServer::ReadSetupSlave() ) { Wizard::CreateDialog(); @@ -221,7 +222,7 @@ Wizard::CloseDialog(); if ( slave_ret == `next ) { - LdapServer::SetupRemoteForReplication(); + LdapServer::SetupRemoteForReplication(); } else { @@ -229,7 +230,6 @@ return ret; } } - LdapServer::ReadFromDefaults(); map <string,any> defaults = LdapServer::ReadInitialDefaults(); Progress::set(false); -- 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] r59746 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm
by rhafer＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: rhafer Date: Tue Nov 24 17:53:56 2009 New Revision: 59746 URL: http://svn.opensuse.org/viewcvs/yast?rev=59746&view=rev Log: Check if TLS config is empty before accessing it Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm Tue Nov 24 17:53:56 2009 @@ -1429,9 +1429,16 @@ } } my $oldtls = $self->ReadTlsConfig(); - if ( $oldtls->{'certKeyFile'} ne $tls->{'certKeyFile'} || - $oldtls->{'certFile'} ne $tls->{'certFile'} || - $oldtls->{'caCertFile'} ne $tls->{'caCertFile'}) + if ( ref($oldtls) eq "HASH" ) + { + if( $oldtls->{'certKeyFile'} ne $tls->{'certKeyFile'} || + $oldtls->{'certFile'} ne $tls->{'certFile'} || + $oldtls->{'caCertFile'} ne $tls->{'caCertFile'} ) + { + $restartRequired = 1; + } + } + elsif ( $tls->{'tls_active'} ) { $restartRequired = 1; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59745 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc
by rhafer＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: rhafer Date: Tue Nov 24 17:53:53 2009 New Revision: 59745 URL: http://svn.opensuse.org/viewcvs/yast?rev=59745&view=rev Log: throw error when trying to write globals before initialization Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc Tue Nov 24 17:53:53 2009 @@ -1090,6 +1090,10 @@ if ( path->length() == 0 ) { return YCPNull(); } else { + if ( ! globals ) + { + throw std::runtime_error("Configuration not initialized." ); + } if ( path->component_str(0) == "loglevel" ) { y2milestone("Write loglevel"); -- 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] <web-client> master : add translations for registration data keys (bnc#557176) version 0.0.5
by J.Daniel Schmidt 24 Nov '09

24 Nov '09

ref: refs/heads/master commit baf5c5d3e72abd413a9ca50cd81f28e73b0514e0 Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Tue Nov 24 17:44:12 2009 +0100 add translations for registration data keys (bnc#557176) version 0.0.5 --- .../app/controllers/registration_controller.rb | 40 +++++++++++++++++--- .../app/views/registration/index.rhtml | 2 +- .../package/yast2-webclient-registration.changes | 6 +++ .../package/yast2-webclient-registration.spec | 2 +- 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/plugins/registration/app/controllers/registration_controller.rb b/plugins/registration/app/controllers/registration_controller.rb index 0e2ca08..d5979b3 100644 --- a/plugins/registration/app/controllers/registration_controller.rb +++ b/plugins/registration/app/controllers/registration_controller.rb @@ -8,6 +8,19 @@ class RegistrationController < ApplicationController layout 'main' include ProxyLoader + def initialize + @trans = { 'email' => _("Email"), + 'moniker' => _("System Name"), + 'regcode-sles' => _("SLES Registration Code"), + 'regcode-sled' => _("SLED Registration Code"), + 'appliance-regcode' => _("Appliance Registration Code"), + '___getittranslated1' => _("Registration Code"), + '___getittranslated2' => _("Hostname"), + '___getittranslated3' => _("Device Name"), + '___getittranslated4' => _("Appliance Name") } + @trans.freeze + end + private def client_permissions @client = YaST::ServiceResource.proxy_for('org.opensuse.yast.modules.registration.registration') @@ -21,6 +34,21 @@ class RegistrationController < ApplicationController @arguments = [] end + def translate_argument_key(key) + return '-unknown-' unless key + return @trans[key] if @trans[key] + key + end + + def sort_arguments(args) + return Array.new unless args + args.collect! do |arg| + arg['description'] = translate_argument_key( arg['name'] ) + arg + end + args.sort! { |a,b| a['name'] <=> b['name'] } + end + # Initialize GetText and Content-Type. init_gettext "yast_webclient_registration" # textdomain, options(:charset, :content_type) @@ -61,7 +89,7 @@ class RegistrationController < ApplicationController error = Hash.from_xml(e.response.body)["registration"] if error && error["status"] == "missinginfo" && !error["missingarguments"].blank? logger.debug "missing arguments #{error["missingarguments"].inspect}" - @arguments = error["missingarguments"].sort {|a,b| a["name"] <=> b["name"] } #in order to show it in an unique order + @arguments = sort_arguments( error["missingarguments"] ) #in order to show it in an unique order else logger.error "error while getting arguments: #{error.inspect}" # keep the old message for the translation, in case we need it later @@ -90,7 +118,7 @@ class RegistrationController < ApplicationController redirect_to root_path return false end - params.each {| key, value | + params.each {| key, value | if key.starts_with? "registration_arg," argument = Hash.new argument["name"] = key[17, key.size-17] @@ -165,18 +193,18 @@ class RegistrationController < ApplicationController argument } #add the rest of missed arguments - missed_args.collect! {|missed_arg| + missed_args.collect! {|missed_arg| missed_arg["error"] = true missed_arg } @arguments.concat(missed_args) flash[:error] = _("Please fill out missing entries.") else - logger.error "error while registration: #{error.inspect}" + logger.error "error while registration: #{error.inspect}" flash[:error] = _("Error occured while connecting to registration server.") end - end - @arguments.sort! {|a,b| a["name"] <=> b["name"] } #in order to show it in an unique order + end + @arguments = sort_arguments( @arguments ) #in order to show it in an unique order if success logger.info "registration succeed" diff --git a/plugins/registration/app/views/registration/index.rhtml b/plugins/registration/app/views/registration/index.rhtml index 88b4985..0f45c63 100644 --- a/plugins/registration/app/views/registration/index.rhtml +++ b/plugins/registration/app/views/registration/index.rhtml @@ -23,7 +23,7 @@ <% if argument["flag"] == "m" || @detail then %> <p> <label for="<%= 'registration_arg_'+argument['name'] %>" <%= argument["error"] ? 'style="color: red"' : '' %> > - <%=_(argument["name"])%> + <%=_(argument['description'])%> </label> <%= text_field_tag "registration_arg,"+argument["name"], argument["value"] %> </p> diff --git a/plugins/registration/package/yast2-webclient-registration.changes b/plugins/registration/package/yast2-webclient-registration.changes index 9a5d684..8a4b426 100644 --- a/plugins/registration/package/yast2-webclient-registration.changes +++ b/plugins/registration/package/yast2-webclient-registration.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 24 17:42:22 CET 2009 - jdsn(a)suse.de + +- add translations for registration data keys (bnc#557176) +- version 0.0.5 + +------------------------------------------------------------------- Sat Nov 14 04:08:25 CET 2009 - jdsn(a)suse.de - adapt index action to behave like other webyast modules diff --git a/plugins/registration/package/yast2-webclient-registration.spec b/plugins/registration/package/yast2-webclient-registration.spec index 3b4d7f2..9a36ddc 100644 --- a/plugins/registration/package/yast2-webclient-registration.spec +++ b/plugins/registration/package/yast2-webclient-registration.spec @@ -14,7 +14,7 @@ PreReq: yast2-webclient License: GPL v2 only Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.4 +Version: 0.0.5 Release: 0 Summary: YaST2 - Webclient - Registration Source: www.tar.bz2 -- 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] <web-client> backgroud_patches_bnc550934 : add translations for registration data keys (bnc#557176) version 0.0.5
by J.Daniel Schmidt 24 Nov '09

24 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit baf5c5d3e72abd413a9ca50cd81f28e73b0514e0 Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Tue Nov 24 17:44:12 2009 +0100 add translations for registration data keys (bnc#557176) version 0.0.5 --- .../app/controllers/registration_controller.rb | 40 +++++++++++++++++--- .../app/views/registration/index.rhtml | 2 +- .../package/yast2-webclient-registration.changes | 6 +++ .../package/yast2-webclient-registration.spec | 2 +- 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/plugins/registration/app/controllers/registration_controller.rb b/plugins/registration/app/controllers/registration_controller.rb index 0e2ca08..d5979b3 100644 --- a/plugins/registration/app/controllers/registration_controller.rb +++ b/plugins/registration/app/controllers/registration_controller.rb @@ -8,6 +8,19 @@ class RegistrationController < ApplicationController layout 'main' include ProxyLoader + def initialize + @trans = { 'email' => _("Email"), + 'moniker' => _("System Name"), + 'regcode-sles' => _("SLES Registration Code"), + 'regcode-sled' => _("SLED Registration Code"), + 'appliance-regcode' => _("Appliance Registration Code"), + '___getittranslated1' => _("Registration Code"), + '___getittranslated2' => _("Hostname"), + '___getittranslated3' => _("Device Name"), + '___getittranslated4' => _("Appliance Name") } + @trans.freeze + end + private def client_permissions @client = YaST::ServiceResource.proxy_for('org.opensuse.yast.modules.registration.registration') @@ -21,6 +34,21 @@ class RegistrationController < ApplicationController @arguments = [] end + def translate_argument_key(key) + return '-unknown-' unless key + return @trans[key] if @trans[key] + key + end + + def sort_arguments(args) + return Array.new unless args + args.collect! do |arg| + arg['description'] = translate_argument_key( arg['name'] ) + arg + end + args.sort! { |a,b| a['name'] <=> b['name'] } + end + # Initialize GetText and Content-Type. init_gettext "yast_webclient_registration" # textdomain, options(:charset, :content_type) @@ -61,7 +89,7 @@ class RegistrationController < ApplicationController error = Hash.from_xml(e.response.body)["registration"] if error && error["status"] == "missinginfo" && !error["missingarguments"].blank? logger.debug "missing arguments #{error["missingarguments"].inspect}" - @arguments = error["missingarguments"].sort {|a,b| a["name"] <=> b["name"] } #in order to show it in an unique order + @arguments = sort_arguments( error["missingarguments"] ) #in order to show it in an unique order else logger.error "error while getting arguments: #{error.inspect}" # keep the old message for the translation, in case we need it later @@ -90,7 +118,7 @@ class RegistrationController < ApplicationController redirect_to root_path return false end - params.each {| key, value | + params.each {| key, value | if key.starts_with? "registration_arg," argument = Hash.new argument["name"] = key[17, key.size-17] @@ -165,18 +193,18 @@ class RegistrationController < ApplicationController argument } #add the rest of missed arguments - missed_args.collect! {|missed_arg| + missed_args.collect! {|missed_arg| missed_arg["error"] = true missed_arg } @arguments.concat(missed_args) flash[:error] = _("Please fill out missing entries.") else - logger.error "error while registration: #{error.inspect}" + logger.error "error while registration: #{error.inspect}" flash[:error] = _("Error occured while connecting to registration server.") end - end - @arguments.sort! {|a,b| a["name"] <=> b["name"] } #in order to show it in an unique order + end + @arguments = sort_arguments( @arguments ) #in order to show it in an unique order if success logger.info "registration succeed" diff --git a/plugins/registration/app/views/registration/index.rhtml b/plugins/registration/app/views/registration/index.rhtml index 88b4985..0f45c63 100644 --- a/plugins/registration/app/views/registration/index.rhtml +++ b/plugins/registration/app/views/registration/index.rhtml @@ -23,7 +23,7 @@ <% if argument["flag"] == "m" || @detail then %> <p> <label for="<%= 'registration_arg_'+argument['name'] %>" <%= argument["error"] ? 'style="color: red"' : '' %> > - <%=_(argument["name"])%> + <%=_(argument['description'])%> </label> <%= text_field_tag "registration_arg,"+argument["name"], argument["value"] %> </p> diff --git a/plugins/registration/package/yast2-webclient-registration.changes b/plugins/registration/package/yast2-webclient-registration.changes index 9a5d684..8a4b426 100644 --- a/plugins/registration/package/yast2-webclient-registration.changes +++ b/plugins/registration/package/yast2-webclient-registration.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 24 17:42:22 CET 2009 - jdsn(a)suse.de + +- add translations for registration data keys (bnc#557176) +- version 0.0.5 + +------------------------------------------------------------------- Sat Nov 14 04:08:25 CET 2009 - jdsn(a)suse.de - adapt index action to behave like other webyast modules diff --git a/plugins/registration/package/yast2-webclient-registration.spec b/plugins/registration/package/yast2-webclient-registration.spec index 3b4d7f2..9a36ddc 100644 --- a/plugins/registration/package/yast2-webclient-registration.spec +++ b/plugins/registration/package/yast2-webclient-registration.spec @@ -14,7 +14,7 @@ PreReq: yast2-webclient License: GPL v2 only Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.4 +Version: 0.0.5 Release: 0 Summary: YaST2 - Webclient - Registration Source: www.tar.bz2 -- 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] r59744 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: fehr Date: Tue Nov 24 17:11:38 2009 New Revision: 59744 URL: http://svn.opensuse.org/viewcvs/yast?rev=59744&view=rev Log: do not format hfs boot partition on mac systems (#447782) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Nov 24 17:11:38 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Nov 24 17:13:39 CET 2009 - fehr(a)suse.de + +- do not format hfs boot partition on mac systems (#447782) + +------------------------------------------------------------------- Tue Nov 24 14:59:54 CET 2009 - fehr(a)suse.de - enabled to set "noauto" option for LUKS-encrypted volumes Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Nov 24 17:11:38 2009 @@ -3521,7 +3521,9 @@ ret["used_fs"] = Partitions::DefaultFs(); } if( ret["used_fs"]:`unknown == `unknown || - ret["used_fs"]:`unknown == `none ) + ret["used_fs"]:`unknown == `none || + ret["used_fs"]:`unknown == `hfs || + ret["used_fs"]:`unknown == `hfsplus ) ret["format"] = false; else ret["format"] = true; -- 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] r59743 - in /trunk/installation/control: control.SLED.xml control.SLES.xml
by kmachalkova＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: kmachalkova Date: Tue Nov 24 17:00:52 2009 New Revision: 59743 URL: http://svn.opensuse.org/viewcvs/yast?rev=59743&view=rev Log: missing unique ids Modified: trunk/installation/control/control.SLED.xml trunk/installation/control/control.SLES.xml Modified: trunk/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLED.xml (original) +++ trunk/installation/control/control.SLED.xml Tue Nov 24 17:00:52 2009 @@ -437,6 +437,7 @@ <mode>live_installation</mode> <stage>initial</stage> <name>initial</name> + <unique_id>live_inst_initial</unique_id> <enable_skip>no</enable_skip> <proposal_modules config:type="list"> <proposal_module>hwinfo</proposal_module> Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Tue Nov 24 17:00:52 2009 @@ -493,6 +493,7 @@ <mode>live_installation</mode> <stage>initial</stage> <name>initial</name> + <unique_id>live_inst_initial</unique_id> <enable_skip>no</enable_skip> <proposal_modules config:type="list"> <proposal_module>hwinfo</proposal_module> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0