Hello community, here is the log from the commit of package yast2-drbd for openSUSE:Factory checked in at 2015-08-05 06:50:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-05-15 10:06:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-drbd.new/yast2-drbd.changes 2015-08-05 06:50:31.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 24 07:07:12 UTC 2015 - [email protected] + +- BSC#939338, using kmp package for drbd8.4.6 +- Require drbd-utils for user space. + +------------------------------------------------------------------- Old: ---- yast2-drbd-3.1.12.tar.bz2 New: ---- yast2-drbd-3.1.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-drbd.spec ++++++ --- /var/tmp/diff_new_pack.RkpnIC/_old 2015-08-05 06:50:31.000000000 +0200 +++ /var/tmp/diff_new_pack.RkpnIC/_new 2015-08-05 06:50:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-drbd -Version: 3.1.12 +Version: 3.1.13 Release: 0 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services ++++++ yast2-drbd-3.1.12.tar.bz2 -> yast2-drbd-3.1.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.12/package/yast2-drbd.changes new/yast2-drbd-3.1.13/package/yast2-drbd.changes --- old/yast2-drbd-3.1.12/package/yast2-drbd.changes 2015-05-15 08:56:09.000000000 +0200 +++ new/yast2-drbd-3.1.13/package/yast2-drbd.changes 2015-07-24 09:11:10.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 24 07:07:12 UTC 2015 - [email protected] + +- BSC#939338, using kmp package for drbd8.4.6 +- Require drbd-utils for user space. + +------------------------------------------------------------------- Fri May 15 06:44:30 UTC 2015 - [email protected] - Feature implementation for SLE12SP1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.12/package/yast2-drbd.spec new/yast2-drbd-3.1.13/package/yast2-drbd.spec --- old/yast2-drbd-3.1.12/package/yast2-drbd.spec 2015-05-15 08:56:09.000000000 +0200 +++ new/yast2-drbd-3.1.13/package/yast2-drbd.spec 2015-07-24 09:11:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-drbd -Version: 3.1.12 +Version: 3.1.13 Release: 0 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.12/src/modules/Drbd.rb new/yast2-drbd-3.1.13/src/modules/Drbd.rb --- old/yast2-drbd-3.1.12/src/modules/Drbd.rb 2015-05-15 08:56:09.000000000 +0200 +++ new/yast2-drbd-3.1.13/src/modules/Drbd.rb 2015-07-24 09:11:10.000000000 +0200 @@ -208,37 +208,20 @@ Progress.NextStage - if SCR.Execute( path(".target.bash"), - "modinfo drbd >/dev/null 2>&1" ) != 0 - # If no drbd module installed in kernel, should install drbd-kmp-<arch> - # Should work in SLE11SP3/12 or openSUSE12.3. May obsolete in future. - # check installed packages - # find out which krbd-kmp-<arch> to be installed - out = Convert.to_map( - SCR.Execute( - path(".target.bash_output"), - "echo -n `uname -r|grep -Eo \"default|smp|bigsmp|desktop|pae|xen|xenpae|debug|ppc64|iseries64\"`" - ) + out = Convert.to_map( + SCR.Execute( + path(".target.bash_output"), + "echo -n `uname -r|grep -Eo \"default|smp|bigsmp|desktop|pae|xen|xenpae|debug|ppc64|iseries64\"`" ) - krbd_kmp_arch = Ops.get_string(out, "stdout", "default") + ) + krbd_kmp_arch = Ops.get_string(out, "stdout", "default") - if !Mode.test && - !PackageSystem.CheckAndInstallPackagesInteractive( - ["drbd", Ops.add("drbd-kmp-", krbd_kmp_arch)] - ) - return false - end - else - # In openSUSE13.1/13.2, no package named drbd-utils. - # It's an issue of drbd/drbd-utils. - # drbd-utils only needed when openSUSE>13.2 - # see BNC#900818 for more information. - if !Mode.test && - !PackageSystem.CheckAndInstallPackagesInteractive( - ["drbd-utils"] - ) - return false - end + # BSC#939338, change back to use kmp package and drbd-utils for user space + if !Mode.test && + !PackageSystem.CheckAndInstallPackagesInteractive( + ["drbd", Ops.add("drbd-kmp-", krbd_kmp_arch), "drbd-utils"] + ) + return false end if Ops.greater_than(
