diff options
author | Mike Christie <michaelc@cs.wisc.edu> | 2008-03-20 10:43:36 -0500 |
---|---|---|
committer | Mike Christie <michaelc@cs.wisc.edu> | 2008-03-20 10:43:36 -0500 |
commit | d8060001c26cc5d8206525900cb1ef6a8a2e9da2 (patch) | |
tree | 7567f41ab27701eca34178c6673e205f98a714c5 | |
parent | e915c85ab137adea14b6e83a3259c282527e17e2 (diff) | |
download | open-iscsi-d8060001c26cc5d8206525900cb1ef6a8a2e9da2.tar.gz |
Fixup debian info
Patch and info from Andrew Moise:
Okay, patch is attached. I wound up doing some things differently
than I mentioned -- the trouble with KERNEL_TARGET turned out to just
be because I hadn't installed the needed headers, and I added the
dpkg-divert script as a Makefile target instead of a snippet of code
in the docs that people have to cut and paste. I also mentioned the
ib_iser situation (which I hope I described accurately).
-rw-r--r-- | README | 18 | ||||
-rw-r--r-- | kernel/Makefile | 5 |
2 files changed, 19 insertions, 4 deletions
@@ -101,16 +101,26 @@ To compile on SUSE Linux you'll have to use where <config> is the kernel configuration to use (eg. 'smp'). -If you choose to install the Debian packages instead of building from source, -please read the file /usr/share/doc/linux-iscsi/README.debian for information -on how to build kernel modules against your specific kernel. - For Red Hat/Fedora and Debian distributions open-iscsi can be installed by typing "make install". This will copy iscsid and iscsiadm to /usr/sbin, the init script to /etc/init.d, and the kernel modules: iscsi_tcp.ko, libiscsi.ko and scsi_transport_iscsi to /lib/modules/`uname -r`/kernel/drivers/scsi/ overwriting existing iscsi modules. +For Debian, be sure to install the linux-headers package that +corresponds to your kernel in order to compile the kernel modules +('aptitude install linux-headers-`uname -r`'). You may also wish to +run 'make -C kernel/ dpkg_divert' before installing kernel modules if +you run a Debian-provided kernel. This will use dpkg-divert(8) to +move the packaged kernel modules out of the way, and ensure that +future kernel upgrades will not overwrite them. + +Also, please be aware that the compatibility patches that enable these +iscsi modules to run on kernels older than 2.6.25 will not update the +ib_iser module; you may get warnings related to mismatched symbols on +this driver, in which case you'll be unable to load ib_iser and +open-iscsi simultaneously. + 4. Open-iSCSI daemon ==================== diff --git a/kernel/Makefile b/kernel/Makefile index 0c9cc7d..7281a60 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -168,4 +168,9 @@ $(ko): all install_kernel: $(ko) $(KBUILD_BASE) modules_install INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) +dpkg_divert: + for module in $(ko) ; do \ + dpkg-divert --rename /lib/modules/$(KERNELRELEASE)/$(INSTALL_MOD_DIR)/$$module ; \ + done + # vim: ft=make tw=72 sw=4 ts=4: |