Hello community,
here is the log from the commit of package yast2-samba-client for
openSUSE:Factory checked in at 2014-09-01 16:58:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-samba-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-samba-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-samba-client"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-samba-client/yast2-samba-client.changes
2014-06-02 07:00:25.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-samba-client.new/yast2-samba-client.changes
2014-09-01 16:58:52.000000000 +0200
@@ -1,0 +2,19 @@
+Thu Aug 28 13:20:17 UTC 2014 - dd...@suse.com
+
+- Support non-default ctdbd socket paths; (bnc#893154).
+- 3.1.12
+
+-------------------------------------------------------------------
+Fri Aug 22 17:48:20 UTC 2014 - dd...@suse.com
+
+- Support separately defined Samba resources; don't manipulate the
+ ctdb_manages_winbind parameter during join; (bnc#892982).
+- 3.1.11
+
+-------------------------------------------------------------------
+Thu Aug 21 17:12:19 UTC 2014 - dd...@suse.com
+
+- Fix CTDB resource primitive path regular expression; (bnc#892975).
+- 3.1.10
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-client-3.1.9.tar.bz2
New:
----
yast2-samba-client-3.1.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.vkTaGO/_old 2014-09-01 16:58:54.000000000 +0200
+++ /var/tmp/diff_new_pack.vkTaGO/_new 2014-09-01 16:58:54.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-samba-client
-Version: 3.1.9
+Version: 3.1.12
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-samba-client-3.1.9.tar.bz2 -> yast2-samba-client-3.1.12.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-client-3.1.9/package/yast2-samba-client.changes
new/yast2-samba-client-3.1.12/package/yast2-samba-client.changes
--- old/yast2-samba-client-3.1.9/package/yast2-samba-client.changes
2014-05-28 11:24:18.000000000 +0200
+++ new/yast2-samba-client-3.1.12/package/yast2-samba-client.changes
2014-08-28 19:03:08.000000000 +0200
@@ -1,4 +1,23 @@
-------------------------------------------------------------------
+Thu Aug 28 13:20:17 UTC 2014 - dd...@suse.com
+
+- Support non-default ctdbd socket paths; (bnc#893154).
+- 3.1.12
+
+-------------------------------------------------------------------
+Fri Aug 22 17:48:20 UTC 2014 - dd...@suse.com
+
+- Support separately defined Samba resources; don't manipulate the
+ ctdb_manages_winbind parameter during join; (bnc#892982).
+- 3.1.11
+
+-------------------------------------------------------------------
+Thu Aug 21 17:12:19 UTC 2014 - dd...@suse.com
+
+- Fix CTDB resource primitive path regular expression; (bnc#892975).
+- 3.1.10
+
+-------------------------------------------------------------------
Tue May 27 16:00:17 UTC 2014 - noel.po...@suse.com
- Mark some strings for translation; (bnc#877744)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-client-3.1.9/package/yast2-samba-client.spec
new/yast2-samba-client-3.1.12/package/yast2-samba-client.spec
--- old/yast2-samba-client-3.1.9/package/yast2-samba-client.spec
2014-05-28 11:24:18.000000000 +0200
+++ new/yast2-samba-client-3.1.12/package/yast2-samba-client.spec
2014-08-28 19:03:08.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-samba-client
-Version: 3.1.9
+Version: 3.1.12
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-samba-client-3.1.9/src/modules/SambaNetJoin.pm
new/yast2-samba-client-3.1.12/src/modules/SambaNetJoin.pm
--- old/yast2-samba-client-3.1.9/src/modules/SambaNetJoin.pm 2014-05-28
11:24:18.000000000 +0200
+++ new/yast2-samba-client-3.1.12/src/modules/SambaNetJoin.pm 2014-08-28
19:03:08.000000000 +0200
@@ -109,7 +109,7 @@
# find out resource and clone ids, to do later crm operations with
my $show = CRMCall ("configure save -");
- if ($show =~ /primitive (\S+) ocf:heartbeat:CTDB/) {
+ if ($show =~ /primitive (\S+) (ocf:heartbeat:)?CTDB/) {
$rsc_id = $1;
}
else {
@@ -169,11 +169,6 @@
return FALSE unless $self->ClusterPresent (0);
- # 3. Run crm configure edit and search for the ctdb resource. Add the
following line:
- # ctdb_manages_winbind="false"
-
- CRMCall ("resource param $rsc_id set ctdb_manages_winbind no");
-
# 4. save winbind into /etc/nsswitch.conf
# 5. Restart the NSC daemon:
SambaWinbind->AdjustNsswitch (TRUE, TRUE);
@@ -182,12 +177,18 @@
# 7. Cleanup CTDB:
CRMCall ("resource cleanup $rsc_id");
- # 8. Wait until the unhealty status disappears.
+ # 8. Wait until the unhealthy status disappears.
my $start = time;
my $wait = 60; # 1 minute timeout
+ my $ctdbd_socket = SambaConfig->GlobalGetStr("ctdbd socket", undef);
+ my $ctdb_args = "";
+ if (defined $ctdbd_socket) {
+ $ctdb_args = "--socket=$ctdbd_socket";
+ }
while (time<$start+$wait) {
- my $out = SCR->Execute(".target.bash_output", "/usr/bin/ctdb
status");
+ my $out = SCR->Execute(".target.bash_output",
+ "/usr/bin/ctdb $ctdb_args status");
last if ($out->{"exit"} == 0);
sleep (1); #0.5);
}
@@ -207,16 +208,8 @@
return TRUE unless $cleanup_needed;
- # 10. Change the ctdb_manages_winbind option:
-
- # a. Stop the ctdb resource:
- CRMCall ("resource stop $rsc_id");
-
- # b. Change the value from false to true: ctdb_manages_winbind="true"
- CRMCall ("resource param $rsc_id set ctdb_manages_winbind yes");
-
- # c. Restart the ctdb resource:
- CRMCall ("resource start $rsc_id");
+ # Restart the ctdb resource, winbind will also be restarted with grouping:
+ CRMCall ("resource restart $rsc_id");
$cleanup_needed = FALSE;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
