Hello community, here is the log from the commit of package yast2-drbd for openSUSE:Factory checked in at 2014-10-29 21:09:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-drbd (Old) and /work/SRC/openSUSE:Factory/.yast2-drbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-drbd" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-drbd/yast2-drbd.changes 2014-09-09 19:00:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-drbd.new/yast2-drbd.changes 2014-10-29 21:10:06.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Oct 27 06:03:25 UTC 2014 - nwang@suse.com + +- BNC#901833. Fix value of "wfc-timeout" and "degr-wfc-timeout" + can not be shown in GUI. +- Add in Maintenance update. +- Version 3.1.8 + +------------------------------------------------------------------- +Fri Oct 10 11:25:57 UTC 2014 - nwang@suse.com + +- BNC#898448. Add validation check of node name. +- Add in Maintenance update. +- Version 3.1.7 + +------------------------------------------------------------------- Old: ---- yast2-drbd-3.1.6.tar.bz2 New: ---- yast2-drbd-3.1.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-drbd.spec ++++++ --- /var/tmp/diff_new_pack.tqohqe/_old 2014-10-29 21:10:09.000000000 +0100 +++ /var/tmp/diff_new_pack.tqohqe/_new 2014-10-29 21:10:09.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-drbd -Version: 3.1.6 +Version: 3.1.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-drbd-3.1.6.tar.bz2 -> yast2-drbd-3.1.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.6/package/yast2-drbd.changes new/yast2-drbd-3.1.8/package/yast2-drbd.changes --- old/yast2-drbd-3.1.6/package/yast2-drbd.changes 2014-09-09 11:02:22.000000000 +0200 +++ new/yast2-drbd-3.1.8/package/yast2-drbd.changes 2014-10-27 07:16:11.000000000 +0100 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Mon Oct 27 06:03:25 UTC 2014 - nwang@suse.com + +- BNC#901833. Fix value of "wfc-timeout" and "degr-wfc-timeout" + can not be shown in GUI. +- Add in Maintenance update. +- Version 3.1.8 + +------------------------------------------------------------------- +Fri Oct 10 11:25:57 UTC 2014 - nwang@suse.com + +- BNC#898448. Add validation check of node name. +- Add in Maintenance update. +- Version 3.1.7 + +------------------------------------------------------------------- Tue Sep 9 08:58:07 UTC 2014 - nwang@suse.com - BNC#460178. Exit directly if no any modification. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.6/package/yast2-drbd.spec new/yast2-drbd-3.1.8/package/yast2-drbd.spec --- old/yast2-drbd-3.1.6/package/yast2-drbd.spec 2014-09-09 11:02:22.000000000 +0200 +++ new/yast2-drbd-3.1.8/package/yast2-drbd.spec 2014-10-27 07:16:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-drbd -Version: 3.1.6 +Version: 3.1.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.6/src/include/drbd/helps.rb new/yast2-drbd-3.1.8/src/include/drbd/helps.rb --- old/yast2-drbd-3.1.6/src/include/drbd/helps.rb 2014-09-09 11:02:22.000000000 +0200 +++ new/yast2-drbd-3.1.8/src/include/drbd/helps.rb 2014-10-27 07:16:11.000000000 +0100 @@ -74,10 +74,10 @@ ) + _( "\n" + - "\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes</p>\n" + + "\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes. Should not include \".\" in hostname.</p>\n" + "\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>\n" + - "\t\t<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number.\n" + - "\t\tLike: '/dev/drbd_r0 minor 0\'</p>\n" + + "\t\t<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number. Or either omit the name or minor and the minor number. If you omit the name a default of /dev/drbdminor will be used.\n" + + "\t\tLike: '/dev/drbd{service} minor {minor drbd number [0...255]}' or '/dev/drbd{minor drbd number [0...255]}'</p>\n" + "\t\t<p>\"Disk\": DRBD uses this block device to actually store and retrieve the data. Never access such a device while DRBD is running on top of it.</p>\n" + "\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n" + "\t\t" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.6/src/include/drbd/resource_conf.rb new/yast2-drbd-3.1.8/src/include/drbd/resource_conf.rb --- old/yast2-drbd-3.1.6/src/include/drbd/resource_conf.rb 2014-09-09 11:02:22.000000000 +0200 +++ new/yast2-drbd-3.1.8/src/include/drbd/resource_conf.rb 2014-10-27 07:16:11.000000000 +0100 @@ -306,12 +306,12 @@ TextEntry( Id(:wfc_timeout), "wfc-timeout", - Ops.get_string(res_config, "wfc-timeout", "") + Ops.get_string(res_config, ["startup", "wfc-timeout"], "") ), TextEntry( Id(:degr_wfc_timeout), "degr-wfc-timeout", - Ops.get_string(res_config, "degr-wfc-timeout", "") + Ops.get_string(res_config, ["startup", "degr-wfc-timeout"], "") ) ) ), @@ -547,6 +547,18 @@ ret = nil next end + + if UI.QueryWidget(Id(:n1_name), :Value).to_s.include?(".") || UI.QueryWidget(Id(:n2_name), :Value).to_s.include?(".") + Popup.Warning(_('Node names must not include "." , using the local hostname.')) + + if UI.QueryWidget(Id(:n1_name), :Value).to_s.include?(".") + UI.SetFocus(Id(:n1_name)) + else + UI.SetFocus(Id(:n2_name)) + end + ret = nil + next + end Drbd.modified = true -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org