December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r59960 - in /branches/SuSE-Code-11-SP1-Branch/users: VERSION package/yast2-users.changes src/YaPI/ADMINISTRATOR.pm src/dialogs.ycp
by jsuchome＠svn.opensuse.org 04 Dec '09

04 Dec '09

Author: jsuchome Date: Fri Dec 4 15:28:11 2009 New Revision: 59960 URL: http://svn.opensuse.org/viewcvs/yast?rev=59960&view=rev Log: - YaPI: call newaliases after updating aliases (bnc#559135) - correctly check for control.xml feature (bnc#560422) - 2.17.32 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/YaPI/ADMINISTRATOR.pm 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 Fri Dec 4 15:28:11 2009 @@ -1 +1 @@ -2.17.31 +2.17.32 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 Fri Dec 4 15:28:11 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Dec 4 15:17:21 CET 2009 - jsuchome(a)suse.cz + +- YaPI: call newaliases after updating aliases (bnc#559135) +- correctly check for control.xml feature (bnc#560422) +- 2.17.32 + +------------------------------------------------------------------- Wed Nov 25 09:12:08 CET 2009 - jsuchome(a)suse.cz - fixed syntax error in dialogs.ycp (bnc#557786) Modified: branches/SuSE-Code-11-SP1-Branch/users/src/YaPI/ADMINISTRATOR.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/users/src/YaPI/ADMINISTRATOR.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/users/src/YaPI/ADMINISTRATOR.pm Fri Dec 4 15:28:11 2009 @@ -9,6 +9,7 @@ # ------------------- imported modules YaST::YCP::Import ("MailAliases"); YaST::YCP::Import ("Mode"); +YaST::YCP::Import ("SCR"); YaST::YCP::Import ("Users"); # ------------------------------------- @@ -80,6 +81,8 @@ $ret = __("An error occurred while setting forwarding for root's mail."); return $ret; } + my $out = SCR->Execute (".target.bash_output", "newaliases"); + $ret = $out->{"stderr"} || ""; } if ($args->{"password"}) { Users->SetRootPassword ($args->{"password"}); 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 Fri Dec 4 15:28:11 2009 @@ -390,8 +390,8 @@ `Left( `CheckBox (`id (`autologin),_("A&utomatic Login"), Autologin::used) ) ); - boolean root_pw_feature = ProductFeatures::GetBooleanFeature ("globals", "root_password_as_first_user"); - if (root_pw_feature != nil) + any root_pw_feature = ProductFeatures::GetFeature ("globals", "root_password_as_first_user"); + if (root_pw_feature != "") optionbox = add (optionbox, `Left (`CheckBox (`id (`root_pw), // checkbox label -- 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 : fix passing hardware clock settings to ntp (bnc#556467)
by Josef Reidinger 04 Dec '09

04 Dec '09

ref: refs/heads/master commit 21308f1be9bf3f1c5123b45150e1bd0aea3c0ef8 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 4 15:22:38 2009 +0100 fix passing hardware clock settings to ntp (bnc#556467) --- plugins/ntp/app/controllers/ntp_controller.rb | 1 + plugins/ntp/app/models/ntp.rb | 6 ++++-- plugins/ntp/package/NTP.pm | 9 +++++++-- plugins/ntp/test/functional/ntp_controller_test.rb | 8 ++++---- plugins/ntp/test/unit/ntp_test.rb | 9 ++++++--- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/plugins/ntp/app/controllers/ntp_controller.rb b/plugins/ntp/app/controllers/ntp_controller.rb index 8af3666..d7dd0fd 100644 --- a/plugins/ntp/app/controllers/ntp_controller.rb +++ b/plugins/ntp/app/controllers/ntp_controller.rb @@ -23,6 +23,7 @@ class NtpController < ApplicationController if root["synchronize"] yapi_perm_check "ntp.synchronize" @ntp.actions[:synchronize] = true + @ntp.actions[:synchronize_utc] = root[:synchronize_utc] end @ntp.save diff --git a/plugins/ntp/app/models/ntp.rb b/plugins/ntp/app/models/ntp.rb index c57115f..4ae1d58 100644 --- a/plugins/ntp/app/models/ntp.rb +++ b/plugins/ntp/app/models/ntp.rb @@ -4,7 +4,9 @@ class Ntp public def initialize - @actions = { :synchronize => false } + @actions = { :synchronize => false, + :synchronize_utc => true + } end def self.find @@ -21,7 +23,7 @@ class Ntp def synchronize ret = "OK" begin - ret = YastService.Call("YaPI::NTP::Synchronize") + ret = YastService.Call("YaPI::NTP::Synchronize",@actions[:synchronize_utc]) rescue Exception => e Rails.logger.info "ntp synchronization cause probably timeout #{e.inspect}" end diff --git a/plugins/ntp/package/NTP.pm b/plugins/ntp/package/NTP.pm index e71acea..46276d7 100644 --- a/plugins/ntp/package/NTP.pm +++ b/plugins/ntp/package/NTP.pm @@ -6,11 +6,12 @@ use YaST::YCP qw(:LOGGING); our %TYPEINFO; -BEGIN{$TYPEINFO{Synchronize} = ["function", +BEGIN{$TYPEINFO{Synchronize} = ["function","boolean" "string"]; } sub Synchronize { my $self = shift; + my $use_utc = shift; my $servers = getServers(); my $out = undef; @@ -24,7 +25,11 @@ sub Synchronize { y2warning($out); } return "NOSERVERS" unless (defined ($out)); - my $ret = `/sbin/hwclock --utc --systohc`; + my $local = "--utc" + unless $use_utc { + my $local = "--localtime" + } + my $ret = `/sbin/hwclock $local --systohc`; y2milestone("hwclock returns $?: $ret"); if ($? == 0){ return "OK"; diff --git a/plugins/ntp/test/functional/ntp_controller_test.rb b/plugins/ntp/test/functional/ntp_controller_test.rb index 9709de5..09951d5 100644 --- a/plugins/ntp/test/functional/ntp_controller_test.rb +++ b/plugins/ntp/test/functional/ntp_controller_test.rb @@ -23,14 +23,14 @@ class SystemControllerTest < ActionController::TestCase end def test_update - YastService.stubs(:Call).with("YaPI::NTP::Synchronize").once.returns("OK") - post :update, {"ntp"=>{"synchronize"=>true}} + YastService.stubs(:Call).with("YaPI::NTP::Synchronize",true).once.returns("OK") + post :update, {"ntp"=>{"synchronize"=>true,"synchronize_utc"=>true}} assert_response :success end def test_update_failed - YastService.stubs(:Call).with("YaPI::NTP::Synchronize").once.returns("Failed") - post :update, {"ntp"=>{"synchronize"=>true}} + YastService.stubs(:Call).with("YaPI::NTP::Synchronize",false).once.returns("Failed") + post :update, {"ntp"=>{"synchronize"=>true,"synchronize_utc" => false}} assert_response 503 end diff --git a/plugins/ntp/test/unit/ntp_test.rb b/plugins/ntp/test/unit/ntp_test.rb index 2783e1f..963ba50 100644 --- a/plugins/ntp/test/unit/ntp_test.rb +++ b/plugins/ntp/test/unit/ntp_test.rb @@ -15,7 +15,8 @@ class NtpTest < ActiveSupport::TestCase def test_synchronize_ok @model.actions[:synchronize] = true - YastService.stubs(:Call).with("YaPI::NTP::Synchronize").once.returns("OK") + @model.actions[:synchronize_utc] = true + YastService.stubs(:Call).with("YaPI::NTP::Synchronize",true).once.returns("OK") assert_nothing_raised do @model.save end @@ -23,7 +24,8 @@ class NtpTest < ActiveSupport::TestCase def test_synchronize_error @model.actions[:synchronize] = true - YastService.stubs(:Call).with("YaPI::NTP::Synchronize").once.returns("No server defined") + @model.actions[:synchronize_utc] = true + YastService.stubs(:Call).with("YaPI::NTP::Synchronize",true).once.returns("No server defined") assert_raise(NtpError.new "No server defined") do @model.save end @@ -31,10 +33,11 @@ class NtpTest < ActiveSupport::TestCase def test_synchronize_error @model.actions[:synchronize] = true + @model.actions[:synchronize_utc] = true msg_mock = mock() msg_mock.stubs(:error_name).returns("org.freedesktop.DBus.Error.NoReply") msg_mock.stubs(:params).returns(["test","test"]) - YastService.stubs(:Call).with("YaPI::NTP::Synchronize").once.raises(DBus::Error,msg_mock) + YastService.stubs(:Call).with("YaPI::NTP::Synchronize",true).once.raises(DBus::Error,msg_mock) assert_nothing_raised do @model.save -- 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] r59959 - /tags/branch-Code-11-SP1-2_17_86/storage/
by aschnell＠svn.opensuse.org 04 Dec '09

04 Dec '09

Author: aschnell Date: Fri Dec 4 14:43:13 2009 New Revision: 59959 URL: http://svn.opensuse.org/viewcvs/yast?rev=59959&view=rev Log: Created tag branch-Code-11-SP1-2_17_86 for storage Added: tags/branch-Code-11-SP1-2_17_86/storage/ (props changed) - copied from r59958, branches/SuSE-Code-11-SP1-Branch/storage/ -- 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] r59958 - /tags/branch-Code-11-SP1-2_17_86/
by aschnell＠svn.opensuse.org 04 Dec '09

04 Dec '09

Author: aschnell Date: Fri Dec 4 14:43:12 2009 New Revision: 59958 URL: http://svn.opensuse.org/viewcvs/yast?rev=59958&view=rev Log: Created tag branch-Code-11-SP1-2_17_86 Added: tags/branch-Code-11-SP1-2_17_86/ -- 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 : Require fixes in lighttpd and sysvinit (bnc#559534, bnc#560302).
by Martin Vidner 04 Dec '09

04 Dec '09

ref: refs/heads/master commit c827dbff4be050721d48aae7497a3aacf6146c20 Author: Martin Vidner <mvidner(a)suse.cz> Date: Fri Dec 4 14:39:55 2009 +0100 Require fixes in lighttpd and sysvinit (bnc#559534, bnc#560302). Simplified the init script as a side effect (bnc#560302). Require startproc respecting -p, bnc#559534#c44 Require lighttpd whose postun does not mass kill, bnc#559534#c19 --- webclient/package/yast2-webclient.changes | 9 +++++++++ webclient/package/yast2-webclient.spec | 18 ++++++++++++++++-- webclient/package/yastwc | 12 +++++------- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index fdbefcd..c639c20 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Dec 4 14:25:13 CET 2009 - mvidner(a)suse.cz + +- Require fixes in other packages so that rclighttpd does not kill + WebYaST. Simplified the init script as a side effect (bnc#560302). + * Require startproc respecting -p, bnc#559534#c44 + * Require lighttpd whose postun does not mass kill, bnc#559534#c19 +- 0.0.28 + +------------------------------------------------------------------- Wed Dec 2 20:41:21 CET 2009 - kkaempf(a)suse.de - trigger service restart on lighttpd update (bnc#559534) diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec index 1ce5122..03ca093 100644 --- a/webclient/package/yast2-webclient.spec +++ b/webclient/package/yast2-webclient.spec @@ -11,13 +11,27 @@ Name: yast2-webclient Requires: lighttpd-mod_magnet, ruby-fcgi, sqlite -PreReq: lighttpd, rubygem-rake, rubygem-sqlite3 +PreReq: rubygem-rake, rubygem-sqlite3 PreReq: rubygem-rails-2_3 = 2.3.4 PreReq: rubygem-gettext_rails +%if 0%{?suse_version} == 0 || %suse_version > 1110 +# 11.2 or newer +# Require startproc respecting -p, bnc#559534#c44 +Requires: sysvinit > 2.86-215.2 +# Require lighttpd whose postun does not mass kill, bnc#559534#c19 +# (Updating it later does not work because postun uses the old +# version.) +PreReq: lighttpd > 1.4.20-3.6 +%else +# 11.1 or SLES11 +Requires: sysvinit > 2.86-195.3.1 +PreReq: lighttpd > 1.4.20-2.29.1 +%endif + License: LGPL v2.1;ASLv2.0 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.27 +Version: 0.0.28 Release: 0 Summary: YaST2 - Webclient Source: www.tar.bz2 diff --git a/webclient/package/yastwc b/webclient/package/yastwc index 164dcfa..8030684 100755 --- a/webclient/package/yastwc +++ b/webclient/package/yastwc @@ -126,8 +126,6 @@ test -r $LIGHTTPD_CONFIG || { echo "$LIGHTTPD_CONFIG not existing"; else exit 6; fi; } PID_FILE=/var/run/yastwc.pid -IGNORE_FILE=/var/run/yastws.pid - CERTIFICATEFILE=/etc/lighttpd/certs/webyast.pem CERTKEYFILE=/etc/lighttpd/certs/webyast.key @@ -190,7 +188,7 @@ case "$1" in fi echo -n "Starting yastwc " - startproc -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN -f $LIGHTTPD_CONFIG + startproc -p $PID_FILE $LIGHTTPD_BIN -f $LIGHTTPD_CONFIG # Remember status and be verbose rc_status -v @@ -207,7 +205,7 @@ case "$1" in ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. - killproc -TERM -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN + killproc -TERM -p $PID_FILE $LIGHTTPD_BIN # Remember status and be verbose rc_status -v @@ -244,7 +242,7 @@ case "$1" in echo -n "Reload service yastwc " ## if it supports it: - killproc -HUP -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN + killproc -HUP -p $PID_FILE $LIGHTTPD_BIN #touch /var/run/lighttpd.pid rc_status -v @@ -258,7 +256,7 @@ case "$1" in # If it supports signaling: echo -n "Reload service yastwc " - killproc -HUP -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN + killproc -HUP -p $PID_FILE $LIGHTTPD_BIN #touch /var/run/lighttpd.pid rc_status -v @@ -280,7 +278,7 @@ case "$1" in # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. - checkproc -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN + checkproc -p $PID_FILE $LIGHTTPD_BIN # NOTE: rc_status knows that we called this init script with # "status" option and adapts its messages accordingly. rc_status -v -- 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 : Require fixes in lighttpd and sysvinit (bnc#559534, bnc#560302).
by Martin Vidner 04 Dec '09

04 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit c827dbff4be050721d48aae7497a3aacf6146c20 Author: Martin Vidner <mvidner(a)suse.cz> Date: Fri Dec 4 14:39:55 2009 +0100 Require fixes in lighttpd and sysvinit (bnc#559534, bnc#560302). Simplified the init script as a side effect (bnc#560302). Require startproc respecting -p, bnc#559534#c44 Require lighttpd whose postun does not mass kill, bnc#559534#c19 --- webclient/package/yast2-webclient.changes | 9 +++++++++ webclient/package/yast2-webclient.spec | 18 ++++++++++++++++-- webclient/package/yastwc | 12 +++++------- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index fdbefcd..c639c20 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Dec 4 14:25:13 CET 2009 - mvidner(a)suse.cz + +- Require fixes in other packages so that rclighttpd does not kill + WebYaST. Simplified the init script as a side effect (bnc#560302). + * Require startproc respecting -p, bnc#559534#c44 + * Require lighttpd whose postun does not mass kill, bnc#559534#c19 +- 0.0.28 + +------------------------------------------------------------------- Wed Dec 2 20:41:21 CET 2009 - kkaempf(a)suse.de - trigger service restart on lighttpd update (bnc#559534) diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec index 1ce5122..03ca093 100644 --- a/webclient/package/yast2-webclient.spec +++ b/webclient/package/yast2-webclient.spec @@ -11,13 +11,27 @@ Name: yast2-webclient Requires: lighttpd-mod_magnet, ruby-fcgi, sqlite -PreReq: lighttpd, rubygem-rake, rubygem-sqlite3 +PreReq: rubygem-rake, rubygem-sqlite3 PreReq: rubygem-rails-2_3 = 2.3.4 PreReq: rubygem-gettext_rails +%if 0%{?suse_version} == 0 || %suse_version > 1110 +# 11.2 or newer +# Require startproc respecting -p, bnc#559534#c44 +Requires: sysvinit > 2.86-215.2 +# Require lighttpd whose postun does not mass kill, bnc#559534#c19 +# (Updating it later does not work because postun uses the old +# version.) +PreReq: lighttpd > 1.4.20-3.6 +%else +# 11.1 or SLES11 +Requires: sysvinit > 2.86-195.3.1 +PreReq: lighttpd > 1.4.20-2.29.1 +%endif + License: LGPL v2.1;ASLv2.0 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.27 +Version: 0.0.28 Release: 0 Summary: YaST2 - Webclient Source: www.tar.bz2 diff --git a/webclient/package/yastwc b/webclient/package/yastwc index 164dcfa..8030684 100755 --- a/webclient/package/yastwc +++ b/webclient/package/yastwc @@ -126,8 +126,6 @@ test -r $LIGHTTPD_CONFIG || { echo "$LIGHTTPD_CONFIG not existing"; else exit 6; fi; } PID_FILE=/var/run/yastwc.pid -IGNORE_FILE=/var/run/yastws.pid - CERTIFICATEFILE=/etc/lighttpd/certs/webyast.pem CERTKEYFILE=/etc/lighttpd/certs/webyast.key @@ -190,7 +188,7 @@ case "$1" in fi echo -n "Starting yastwc " - startproc -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN -f $LIGHTTPD_CONFIG + startproc -p $PID_FILE $LIGHTTPD_BIN -f $LIGHTTPD_CONFIG # Remember status and be verbose rc_status -v @@ -207,7 +205,7 @@ case "$1" in ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. - killproc -TERM -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN + killproc -TERM -p $PID_FILE $LIGHTTPD_BIN # Remember status and be verbose rc_status -v @@ -244,7 +242,7 @@ case "$1" in echo -n "Reload service yastwc " ## if it supports it: - killproc -HUP -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN + killproc -HUP -p $PID_FILE $LIGHTTPD_BIN #touch /var/run/lighttpd.pid rc_status -v @@ -258,7 +256,7 @@ case "$1" in # If it supports signaling: echo -n "Reload service yastwc " - killproc -HUP -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN + killproc -HUP -p $PID_FILE $LIGHTTPD_BIN #touch /var/run/lighttpd.pid rc_status -v @@ -280,7 +278,7 @@ case "$1" in # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. - checkproc -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN + checkproc -p $PID_FILE $LIGHTTPD_BIN # NOTE: rc_status knows that we called this init script with # "status" option and adapts its messages accordingly. rc_status -v -- 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] r59957 - in /branches/SuSE-Code-11-SP1-Branch/storage: VERSION libstorage/src/Storage.cc libstorage/src/Volume.cc libstorage/src/Volume.h package/yast2-storage.changes
by aschnell＠svn.opensuse.org 04 Dec '09

04 Dec '09

Author: aschnell Date: Fri Dec 4 14:42:05 2009 New Revision: 59957 URL: http://svn.opensuse.org/viewcvs/yast?rev=59957&view=rev Log: - avoid data loss on encrypted partitions using non-LUKS encryption when integrating them into system (#557607) (backport from head) Modified: branches/SuSE-Code-11-SP1-Branch/storage/VERSION branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.h branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/VERSION Fri Dec 4 14:42:05 2009 @@ -1 +1 @@ -2.17.85 +2.17.86 Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Fri Dec 4 14:42:05 2009 @@ -2631,7 +2631,7 @@ } else if( findVolume( device, cont, vol ) ) { - ret = vol->setEncryption(val, typ, true); + ret = vol->setEncryption( val, typ ); } else { Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc Fri Dec 4 14:42:05 2009 @@ -1328,7 +1328,7 @@ int - Volume::setEncryption(bool val, EncryptType typ, bool force) + Volume::setEncryption(bool val, EncryptType typ) { int ret = 0; y2milestone( "val:%d typ:%d", val, typ ); @@ -1351,25 +1351,19 @@ ret = VOLUME_CRYPT_NO_PWD; if( ret == 0 && cType()==NFSC ) ret = VOLUME_CRYPT_NFS_IMPOSSIBLE; - if (ret == 0 && (create || format || loop_active)) + if (ret == 0 && (create || format || loop_active || mp.empty())) { encryption = typ; is_loop = cont->type()==LOOP; dmcrypt_dev = getDmcryptName(); } - if (ret == 0 && !create && !format && !loop_active) + if (ret == 0 && !create && !format && !loop_active && !mp.empty()) { - if( detectEncryption()==ENC_UNKNOWN && !force) + if( detectEncryption()==ENC_UNKNOWN ) ret = VOLUME_CRYPT_NOT_DETECTED; - else if (force) - { - encryption = typ; - is_loop = cont->type()==LOOP; - dmcrypt_dev = getDmcryptName(); } } } - } if( ret==0 ) { updateFstabOptions(); @@ -1887,8 +1881,8 @@ int Volume::doCryptsetup() { int ret = 0; - y2milestone( "device:%s mp:%s dmcrypt:%d active:%d", - dev.c_str(), mp.c_str(), dmcrypt(), dmcrypt_active ); + y2mil("device:" << dev << " mp:" << mp << " dmcrypt:" << dmcrypt() << + " active:" << dmcrypt_active << " format:" << format ); if( !silent() && dmcrypt() ) { cont->getStorage()->showInfoCb( crsetupText(true) ); @@ -1916,7 +1910,8 @@ pwdfile << crypt_pwd; pwdfile.close(); SystemCmd cmd; - if( (encryption != orig_encryption) || format || (isTmpCryptMp(mp)&&crypt_pwd.empty()) ) + if( format || (isTmpCryptMp(mp)&&crypt_pwd.empty()) || + (encryption!=ENC_NONE&&mp.empty()) ) { string cmdline = getCryptsetupCmd( encryption, dmcrypt_dev, mp, fname, true, crypt_pwd.empty() ); @@ -2305,9 +2300,10 @@ l.push_back( new commitAction( FORMAT, cont->type(), formatText(false), this, true )); } - else if (encryption != orig_encryption) + else if ( encryption != ENC_NONE ) { - l.push_back(new commitAction(FORMAT, cont->type(), crsetupText(false), this, true)); + l.push_back(new commitAction(mp.empty()?INCREASE:FORMAT, cont->type(), + crsetupText(false), this, mp.empty())); } else if( mp != orig_mp || (cont->getStorage()->instsys()&&mp=="swap") ) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.h Fri Dec 4 14:42:05 2009 @@ -101,8 +101,7 @@ storage::EncryptType getEncryption() const { return encryption; } void setEncryption( storage::EncryptType val=storage::ENC_LUKS ) { encryption=orig_encryption=val; } - virtual int setEncryption(bool val, storage::EncryptType typ = storage::ENC_LUKS, - bool force = false); + virtual int setEncryption(bool val, storage::EncryptType typ = storage::ENC_LUKS ); const string& getCryptPwd() const { return crypt_pwd; } int setCryptPwd( const string& val ); void clearCryptPwd() { crypt_pwd.erase(); } Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Fri Dec 4 14:42:05 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Dec 03 10:38:39 CET 2009 - fehr(a)suse.de + +- avoid data loss on encrypted partitions using non-LUKS encryption + when integrating them into system (#557607) +- 2.17.86 + +------------------------------------------------------------------- Fri Nov 27 17:08:15 CET 2009 - aschnell(a)suse.de - enable boot.crypt-early along with boot.crypto (bnc #558888) -- 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 : Require fixes in lighttpd and sysvinit (bnc#559534, bnc#560302).
by Martin Vidner 04 Dec '09

04 Dec '09

ref: refs/heads/master commit 4ab3fbcea1b5aaf42edfdf7a26a1c94fa1d218a0 Author: Martin Vidner <mvidner(a)suse.cz> Date: Fri Dec 4 13:33:29 2009 +0100 Require fixes in lighttpd and sysvinit (bnc#559534, bnc#560302). Simplified the init script as a side effect (bnc#560302). Require startproc respecting -p, bnc#559534#c44 Require lighttpd whose postun does not mass kill, bnc#559534#c19 --- webservice/package/yast2-webservice.changes | 9 +++++++++ webservice/package/yast2-webservice.spec | 11 +++++++++-- webservice/package/yastws | 11 +++++------ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/webservice/package/yast2-webservice.changes b/webservice/package/yast2-webservice.changes index c9319be..3343b79 100644 --- a/webservice/package/yast2-webservice.changes +++ b/webservice/package/yast2-webservice.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Dec 4 14:28:39 CET 2009 - mvidner(a)suse.cz + +- Require fixes in other packages so that rclighttpd does not kill + WebYaST. Simplified the init script as a side effect (bnc#560302). + * Require startproc respecting -p, bnc#559534#c44 + * Require lighttpd whose postun does not mass kill, bnc#559534#c19 +- 0.0.19 + +------------------------------------------------------------------- Wed Dec 2 20:41:21 CET 2009 - kkaempf(a)suse.de - trigger service restart on lighttpd update (bnc#559534) diff --git a/webservice/package/yast2-webservice.spec b/webservice/package/yast2-webservice.spec index 99f4b15..4d81a13 100644 --- a/webservice/package/yast2-webservice.spec +++ b/webservice/package/yast2-webservice.spec @@ -14,9 +14,16 @@ Name: yast2-webservice %if 0%{?suse_version} == 0 || %suse_version > 1110 # 11.2 or newer Requires: yast2-core >= 2.18.10 +# Require startproc respecting -p, bnc#559534#c44 +Requires: sysvinit > 2.86-215.2 +# Require lighttpd whose postun does not mass kill, bnc#559534#c19 +# (Updating it later does not work because postun uses the old version.) +PreReq: lighttpd > 1.4.20-3.6 %else # 11.1 or SLES11 Requires: yast2-core >= 2.17.30.1 +Requires: sysvinit > 2.86-195.3.1 +PreReq: lighttpd > 1.4.20-2.29.1 %endif Requires: lighttpd-mod_magnet, ruby-fcgi, ruby-dbus, sqlite @@ -24,13 +31,13 @@ Requires: rubygem-yast2-webservice-tasks Requires: yast2-dbus-server # gamin gives problems with lighttpd, so better conflict with it for now Conflicts: gamin -PreReq: lighttpd, PolicyKit, PackageKit, rubygem-rake, rubygem-sqlite3 +PreReq: PolicyKit, PackageKit, rubygem-rake, rubygem-sqlite3 PreReq: rubygem-rails-2_3 = 2.3.4 PreReq: ruby-rpam, ruby-polkit, rubygem-test-unit License: LGPL v2.1 only Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.18 +Version: 0.0.19 Release: 0 Summary: YaST2 - Webservice Source: www.tar.bz2 diff --git a/webservice/package/yastws b/webservice/package/yastws index 128650d..35f8307 100755 --- a/webservice/package/yastws +++ b/webservice/package/yastws @@ -126,7 +126,6 @@ test -r $LIGHTTPD_CONFIG || { echo "$LIGHTTPD_CONFIG not existing"; else exit 6; fi; } PID_FILE=/var/run/yastws.pid -IGNORE_FILE=/var/run/yastwc.pid # Source LSB init functions # providing start_daemon, killproc, pidofproc, @@ -176,7 +175,7 @@ case "$1" in #Waiting for yastwc until he has really written his pid file (currently just a hack) sleep 4 - startproc -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN -f $LIGHTTPD_CONFIG + startproc -p $PID_FILE $LIGHTTPD_BIN -f $LIGHTTPD_CONFIG # Remember status and be verbose rc_status -v @@ -185,7 +184,7 @@ case "$1" in echo -n "Shutting down yastws " ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. - killproc -TERM -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN + killproc -TERM -p $PID_FILE $LIGHTTPD_BIN # Remember status and be verbose rc_status -v @@ -222,7 +221,7 @@ case "$1" in echo -n "Reload service yastws " ## if it supports it: - killproc -HUP -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN + killproc -HUP -p $PID_FILE $LIGHTTPD_BIN #touch /var/run/lighttpd.pid rc_status -v @@ -236,7 +235,7 @@ case "$1" in # If it supports signaling: echo -n "Reload service yastws " - killproc -HUP -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN + killproc -HUP -p $PID_FILE $LIGHTTPD_BIN #touch /var/run/lighttpd.pid rc_status -v @@ -258,7 +257,7 @@ case "$1" in # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. - checkproc -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN + checkproc -p $PID_FILE $LIGHTTPD_BIN # NOTE: rc_status knows that we called this init script with # "status" option and adapts its messages accordingly. rc_status -v -- 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] r59956 - /tags/stable-2_19_3/country/
by jsuchome＠svn.opensuse.org 04 Dec '09

04 Dec '09

Author: jsuchome Date: Fri Dec 4 14:20:07 2009 New Revision: 59956 URL: http://svn.opensuse.org/viewcvs/yast?rev=59956&view=rev Log: Created tag stable-2_19_3 for country Added: tags/stable-2_19_3/country/ - copied from r59955, trunk/country/ -- 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] r59955 - /tags/branch-Code-11-SP1-2_17_39/country/
by jsuchome＠svn.opensuse.org 04 Dec '09

04 Dec '09

Author: jsuchome Date: Fri Dec 4 14:20:04 2009 New Revision: 59955 URL: http://svn.opensuse.org/viewcvs/yast?rev=59955&view=rev Log: Created tag branch-Code-11-SP1-2_17_39 for country Added: tags/branch-Code-11-SP1-2_17_39/country/ (props changed) - copied from r59954, branches/SuSE-Code-11-SP1-Branch/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0