Hello community, here is the log from the commit of package yast2-drbd for openSUSE:Factory checked in at 2014-12-22 12:54:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-12-05 21:04:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-drbd.new/yast2-drbd.changes 2014-12-22 12:53:14.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Dec 22 03:08:39 UTC 2014 - [email protected] + +- BNC#900818. Corresponding change of modification of drbd-utils. +- drbd kernel module default installed in kernel, package drbd + also be replaced by package drbd-utils. +- This change should co-work with the first drbd-utils version. +- Version 3.1.11 + +------------------------------------------------------------------- Old: ---- yast2-drbd-3.1.10.tar.bz2 New: ---- yast2-drbd-3.1.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-drbd.spec ++++++ --- /var/tmp/diff_new_pack.ESnuba/_old 2014-12-22 12:53:15.000000000 +0100 +++ /var/tmp/diff_new_pack.ESnuba/_new 2014-12-22 12:53:15.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-drbd -Version: 3.1.10 +Version: 3.1.11 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-drbd-3.1.10.tar.bz2 -> yast2-drbd-3.1.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.10/package/yast2-drbd.changes new/yast2-drbd-3.1.11/package/yast2-drbd.changes --- old/yast2-drbd-3.1.10/package/yast2-drbd.changes 2014-12-04 11:12:02.000000000 +0100 +++ new/yast2-drbd-3.1.11/package/yast2-drbd.changes 2014-12-22 04:16:17.000000000 +0100 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Dec 22 03:08:39 UTC 2014 - [email protected] + +- BNC#900818. Corresponding change of modification of drbd-utils. +- drbd kernel module default installed in kernel, package drbd + also be replaced by package drbd-utils. +- This change should co-work with the first drbd-utils version. +- Version 3.1.11 + +------------------------------------------------------------------- Thu Dec 4 09:50:08 UTC 2014 - [email protected] - remove X-KDE-Library from desktop file (bnc#899104) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.10/package/yast2-drbd.spec new/yast2-drbd-3.1.11/package/yast2-drbd.spec --- old/yast2-drbd-3.1.10/package/yast2-drbd.spec 2014-12-04 11:12:02.000000000 +0100 +++ new/yast2-drbd-3.1.11/package/yast2-drbd.spec 2014-12-22 04:16:17.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-drbd -Version: 3.1.10 +Version: 3.1.11 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.10/src/modules/Drbd.rb new/yast2-drbd-3.1.11/src/modules/Drbd.rb --- old/yast2-drbd-3.1.10/src/modules/Drbd.rb 2014-12-04 11:12:03.000000000 +0100 +++ new/yast2-drbd-3.1.11/src/modules/Drbd.rb 2014-12-22 04:16:17.000000000 +0100 @@ -153,21 +153,37 @@ Progress.NextStage - # 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\"`" + 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\"`" + ) ) - ) - 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 + 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 end if Ops.greater_than( -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
