[DRBD-cvs] r1800 - in branches/drbd-0.7: . debian

[www-data]

Author: lars
Date: 2005-05-23 21:46:50 +0200 (Mon, 23 May 2005)
New Revision: 1800

Modified:
   branches/drbd-0.7/ChangeLog
   branches/drbd-0.7/debian/changelog
   branches/drbd-0.7/drbd.spec.in
Log:
added missing changelog updates
added mv /lib/modules/*/extra/drbd.ko -> *.orig rename
to post install of drbd-km- 



Modified: branches/drbd-0.7/ChangeLog
===================================================================
--- branches/drbd-0.7/ChangeLog	2005-05-23 13:24:47 UTC (rev 1799)
+++ branches/drbd-0.7/ChangeLog	2005-05-23 19:46:50 UTC (rev 1800)
@@ -1,6 +1,6 @@
 Latest:
 ------
- ChangeLog last updated: r1798 2005-05-23
+ ChangeLog last updated: r1801 2005-05-23
  Cumulative changes since last tarball.
  For even more detail, use "svn log" and "svn diff".
 
@@ -15,6 +15,11 @@
  * A workaround to have DBRD running on PPC64 with Linux-2.4.x kernels,
    on Linux-2.6.x everything was fine already.
  * Removal of dead code (busy_blocks).
+ * LINBIT drbd rpms now conflict with km_drbd
+   (SuSE's kernel module source hook)
+ * possibly existing /lib/modules/*/extra/drbd.ko are renamed to .orig in the
+   post-install scripts to avoid conflicts with existing modules from
+   distribution kernel packages
 
 0.7.10 (api:77/proto:74)
 -----

Modified: branches/drbd-0.7/debian/changelog
===================================================================
--- branches/drbd-0.7/debian/changelog	2005-05-23 13:24:47 UTC (rev 1799)
+++ branches/drbd-0.7/debian/changelog	2005-05-23 19:46:50 UTC (rev 1800)
@@ -1,3 +1,10 @@
+drbd (0.7.11-0) unstable; urgency=low
+
+  * (Philipp Reisner)
+     - New upstream release
+
+ -- Philipp Reisner <phil at linbit.com>  Mon, 23 May 2005 15:29:21 +0200
+
 drbd (0.7.10-0) unstable; urgency=low
 
   * (Philipp Reisner)

Modified: branches/drbd-0.7/drbd.spec.in
===================================================================
--- branches/drbd-0.7/drbd.spec.in	2005-05-23 13:24:47 UTC (rev 1799)
+++ branches/drbd-0.7/drbd.spec.in	2005-05-23 19:46:50 UTC (rev 1800)
@@ -171,6 +171,12 @@
 
 #%post -n kernel%{?ksmp}-module-drbd
 %post km-%{krelver}
+# hack for distribution kernel packages,
+# which already contain some (probably outdated) drbd module
+EXTRA_DRBD_KO=/lib/modules/%{kernelversion}/extra/drbd.ko
+if test -e $EXTRA_DRBD_KO; then
+	mv $EXTRA_DRBD_KO $EXTRA_DRBD_KO.orig
+fi
 uname -r | grep BOOT ||
 /sbin/depmod -a -F /boot/System.map-%{kernelversion} %{kernelversion} >/dev/null 2>&1 || true
 
@@ -190,6 +196,11 @@
  * A workaround to have DBRD running on PPC64 with Linux-2.4.x kernels,
    on Linux-2.6.x everything was fine already.
  * Removal of dead code (busy_blocks).
+ * LINBIT drbd rpms now conflict with km_drbd
+   (SuSE's kernel module source hook)
+ * possibly existing /lib/modules/*/extra/drbd.ko are renamed to .orig in the
+   post-install scripts to avoid conflicts with existing modules from
+   distribution kernel packages
 
 * Mon Jan 31 2005 10:17:00 +0200 Philipp Reisner <phil at linbit.com>
 - drbd (0.7.10-1)