Merge branch 'master' of git://git.wolf31o2.org/projs/genkernel

diff --git a/AUTHORS b/AUTHORS
index 12a8fab39743325bd5fa04d1857553b487c5b7bb..3ac777dcd602737d77e262d13b149c5a61cb49c9 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,4 +30,4 @@ Copyright authors:
 ------
 Andrew Gaffney <agaffney@gentoo.org>
 Chris Gianelloni <wolf31o2@wolf31o2.org>
-
+Stefan Behte <craig@haquarter.de>

diff --git a/arch/alpha/modules_load b/arch/alpha/modules_load
index 6147ac48e76eca5c7eeb67c399bcf6ad012f6894..3edfdddfbe7b0d6b4bf19a49ed7203e68a4ea28b 100644 (file)
--- a/arch/alpha/modules_load
+++ b/arch/alpha/modules_load
@@ -16,6 +16,9 @@ MODULES_WAITSCAN="scsi_wait_scan"
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
+# iSCSI support
+MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
+
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"

diff --git a/arch/ia64/modules_load b/arch/ia64/modules_load
index de72e292ef1ef97a7deb9660dd18f46608537923..daa67dfcfe15483116c3d3f19486c17ee2a5c790 100644 (file)
--- a/arch/ia64/modules_load
+++ b/arch/ia64/modules_load
@@ -16,6 +16,9 @@ MODULES_WAITSCAN="scsi_wait_scan"
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
+# iSCSI support
+MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
+
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"

diff --git a/arch/mips/modules_load b/arch/mips/modules_load
index 6147ac48e76eca5c7eeb67c399bcf6ad012f6894..3edfdddfbe7b0d6b4bf19a49ed7203e68a4ea28b 100644 (file)
--- a/arch/mips/modules_load
+++ b/arch/mips/modules_load
@@ -16,6 +16,9 @@ MODULES_WAITSCAN="scsi_wait_scan"
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
+# iSCSI support
+MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
+
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"

diff --git a/arch/parisc/modules_load b/arch/parisc/modules_load
index 6147ac48e76eca5c7eeb67c399bcf6ad012f6894..3edfdddfbe7b0d6b4bf19a49ed7203e68a4ea28b 100644 (file)
--- a/arch/parisc/modules_load
+++ b/arch/parisc/modules_load
@@ -16,6 +16,9 @@ MODULES_WAITSCAN="scsi_wait_scan"
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
+# iSCSI support
+MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
+
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"

diff --git a/arch/parisc64/modules_load b/arch/parisc64/modules_load
index de72e292ef1ef97a7deb9660dd18f46608537923..daa67dfcfe15483116c3d3f19486c17ee2a5c790 100644 (file)
--- a/arch/parisc64/modules_load
+++ b/arch/parisc64/modules_load
@@ -16,6 +16,9 @@ MODULES_WAITSCAN="scsi_wait_scan"
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
+# iSCSI support
+MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
+
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"

diff --git a/arch/ppc/modules_load b/arch/ppc/modules_load
index 6147ac48e76eca5c7eeb67c399bcf6ad012f6894..3edfdddfbe7b0d6b4bf19a49ed7203e68a4ea28b 100644 (file)
--- a/arch/ppc/modules_load
+++ b/arch/ppc/modules_load
@@ -16,6 +16,9 @@ MODULES_WAITSCAN="scsi_wait_scan"
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
+# iSCSI support
+MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
+
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"

diff --git a/arch/ppc64/modules_load b/arch/ppc64/modules_load
index de72e292ef1ef97a7deb9660dd18f46608537923..daa67dfcfe15483116c3d3f19486c17ee2a5c790 100644 (file)
--- a/arch/ppc64/modules_load
+++ b/arch/ppc64/modules_load
@@ -16,6 +16,9 @@ MODULES_WAITSCAN="scsi_wait_scan"
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
+# iSCSI support
+MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
+
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"

diff --git a/arch/sparc/modules_load b/arch/sparc/modules_load
index 6147ac48e76eca5c7eeb67c399bcf6ad012f6894..3edfdddfbe7b0d6b4bf19a49ed7203e68a4ea28b 100644 (file)
--- a/arch/sparc/modules_load
+++ b/arch/sparc/modules_load
@@ -16,6 +16,9 @@ MODULES_WAITSCAN="scsi_wait_scan"
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
+# iSCSI support
+MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
+
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"

diff --git a/arch/sparc64/modules_load b/arch/sparc64/modules_load
index de72e292ef1ef97a7deb9660dd18f46608537923..daa67dfcfe15483116c3d3f19486c17ee2a5c790 100644 (file)
--- a/arch/sparc64/modules_load
+++ b/arch/sparc64/modules_load
@@ -16,6 +16,9 @@ MODULES_WAITSCAN="scsi_wait_scan"
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
+# iSCSI support
+MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
+
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"

diff --git a/arch/um/modules_load b/arch/um/modules_load
index 8ce12956cde6d92d4d81060d023f7b6d0b1f9583..6db56529b07b970e29744b56016d3332214f2aab 100644 (file)
--- a/arch/um/modules_load
+++ b/arch/um/modules_load
@@ -16,6 +16,9 @@ MODULES_WAITSCAN="scsi_wait_scan"
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
+# iSCSI support
+MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
+
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"

diff --git a/arch/x86/modules_load b/arch/x86/modules_load
index b3e7349055fb231bfe7b07b296584f4d4d45cfff..e3f017779356d6bef29dd26bb66208e76308ba4c 100644 (file)
--- a/arch/x86/modules_load
+++ b/arch/x86/modules_load
@@ -17,6 +17,9 @@ MODULES_WAITSCAN="scsi_wait_scan"
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
+# iSCSI support
+MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
+
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"

diff --git a/arch/x86_64/modules_load b/arch/x86_64/modules_load
index fa3adf8c529b78bacd82b4f8b75a805abc4bee75..c706d56c8e33e7c470273e981f5009a5c3e4c8dc 100644 (file)
--- a/arch/x86_64/modules_load
+++ b/arch/x86_64/modules_load
@@ -16,6 +16,9 @@ MODULES_WAITSCAN="scsi_wait_scan"
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
+# iSCSI support
+MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
+
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index a417144d32bb59ce101823cfd12592a8bac9c115..db5cb25b6a4da180e61a74b4076303ad7c984ace 100755 (executable)
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -78,4 +78,4 @@ LOOPS='/livecd.loop /zisofs /livecd.squashfs /image.squashfs /livecd.gcloop'
 # Only sections that are in by default or those that
 # are not module groups need to be defined here...
 HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan slowusb evms lvm dmraid mdadm fs net'
-MY_HWOPTS='modules pata sata scsi usb firewire waitscan dmraid mdadm fs net'
+MY_HWOPTS='modules pata sata scsi usb firewire waitscan dmraid mdadm fs net iscsi'

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 4c233bbed92a18881066f778e4fba8de946618e4..76c5c9b0e3d682d76f860b8dae41d6bf4c5b9dfe 100755 (executable)
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -628,6 +628,17 @@ startVolumes() {
        fi
 }
 
+startiscsi() {
+       
+       if [ -n "${ISCSI_I}" ] && [ -n "${ISCSI_T}" ] && [ -n "${ISCSI_A}" ]
+       then
+               good_msg "Activating ISCSI"
+               iscsistart -i "${ISCSI_I}" -t "${ISCSI_T}" -g 1 -a ${ISCSI_A}
+       fi
+
+}
+
+
 # Open a LUKS device
 # It is either the root or a swap, other devices are supported in the scripts provided with sys-fs/cryptsetup-luks
 # $1 - root/swap

diff --git a/defaults/linuxrc b/defaults/linuxrc
index e109534a0e37e36756aaa68a6fb4b4fed0bd7d16..d50d95a2a05f3286671bf4f9cad42e91e263af1b 100755 (executable)
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -149,6 +149,17 @@ do
                nfsroot\=*)
                        NFSROOT=`parse_opt "${x}"`
                ;;
+               # ISCSI
+               iscsi_i\=*)
+                       ISCSI_I=`parse_opt "${x}"`
+               ;;
+               iscsi_t\=*)
+                       ISCSI_T=`parse_opt "${x}"`
+               ;;
+               iscsi_a\=*)
+                       ISCSI_A=`parse_opt "${x}"`
+               ;;
+               # Crypto
                crypt_root\=*)
                        CRYPT_ROOT=`parse_opt "${x}"`
                ;;
@@ -263,6 +274,9 @@ setup_md_device
 # Scan volumes
 startVolumes
 
+# Start ISCSI
+startiscsi
+
 setup_keymap
 
 # Initialize LUKS root device except for livecd's

diff --git a/defaults/modules_load b/defaults/modules_load
index 44e72050f9f91dffae3da8c1a0fb10886fca18bb..15ad3e5f233aab40c7a4cb86377789c25f5caf81 100644 (file)
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -16,6 +16,9 @@ MODULES_WAITSCAN="scsi_wait_scan"
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
+# iSCSI support
+MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
+
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 20380ac6f16d8c9be4dcfbfd6bc1e0b0ba1979b3..94b426097416aa903cf55f0cb74e9723f3ba701b 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -85,6 +85,7 @@ longusage() {
   echo "       --mdadm                 Copy /etc/mdadm.conf to initramfs"
   echo "       --dmraid                Include DMRAID support"
   echo "       --multipath             Include Multipath support"
+  echo "       --iscsi                 Include iSCSI support"
   echo "       --slowusb               Enables extra pauses for slow USB CD boots"
   echo "       --bootloader=grub       Add new kernel to GRUB configuration"
   echo "       --linuxrc=<file>        Specifies a user created linuxrc"
@@ -290,6 +291,9 @@ parse_cmdline() {
                --bootloader=*)
                        CMD_BOOTLOADER=`parse_opt "$*"`
                        print_info 2 "CMD_BOOTLOADER: ${CMD_BOOTLOADER}"
+               --iscsi)
+                       CMD_ISCSI=1
+                       print_info 2 "CMD_ISCSI: ${CMD_ISCSI}"
                        ;;
                --loglevel=*)
                        CMD_LOGLEVEL=`parse_opt "$*"`

diff --git a/gen_compile.sh b/gen_compile.sh
index d87d2f43b7c3f183d74c438756720951b9304204..1c2851999015b7edd15801c4f036011c6bdfbca3 100755 (executable)
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -620,3 +620,45 @@ compile_unionfs_fuse() {
                rm -rf "${UNIONFS_FUSE_DIR}" > /dev/null
        fi
 }
+
+compile_iscsi() {
+       if [ ! -f "${ISCSI_BINCACHE}" ]
+       then
+               [ ! -f "${ISCSI_SRCTAR}" ] &&
+                       gen_die "Could not find iSCSI source tarball: ${ISCSI_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
+               cd "${TEMP}"
+               rm -rf "${ISCSI_DIR}"
+               tar -zxpf "${ISCSI_SRCTAR}"
+               [ ! -d "${ISCSI_DIR}" ] &&
+                       gen_die "ISCSI directory ${ISCSI_DIR} invalid"
+                               print_info 1 'iSCSI: >> Compiling...'
+               cd "${TEMP}/${ISCSI_DIR}/utils/fwparam_ibft"
+               MAKE=${UTILS_MAKE} compile_generic "" ""
+               cd "${TEMP}/${ISCSI_DIR}/usr"
+               MAKE=${UTILS_MAKE} compile_generic "" ""
+               cd "${TEMP}/${ISCSI_DIR}/kernel"
+
+               # Find out target kernel Version, make modules for that version
+               RELEASE=$(head -n 4 ${CMD_KERNEL_DIR}/Makefile | sed  -r -e 's/^VERSION = (.*)/\1./g' -e 's/PATCHLEVEL = (.*)/\1./g' -e 's/SUBLEVEL = (.*)/\1/g' -e 's/EXTRAVERSION = (.*)/\1/g' | tr -d '\n')
+               KERNELRELEASE=${RELEASE} MAKE=${UTILS_MAKE} compile_generic "" ""
+
+               # copy kernel modules to initramfs
+               mkdir -p "${TEMP}/initramfs-iscsi-temp/lib/modules/${RELEASE}/kernel/drivers/scsi/"
+               cp *.ko "${TEMP}/initramfs-iscsi-temp/lib/modules/${RELEASE}/kernel/drivers/scsi/"
+
+               cd "${TEMP}/initramfs-iscsi-temp/"
+               print_info 1 'iscsistart: >> Copying to cache...'
+               [ -f "${TEMP}/${ISCSI_DIR}/usr/iscsistart" ] ||
+                       gen_die 'iscsistart executable does not exist!'
+               strip "${TEMP}/${ISCSI_DIR}/usr/iscsistart" ||
+                       gen_die 'Could not strip iscsistart binary!'
+               bzip2 "${TEMP}/${ISCSI_DIR}/usr/iscsistart" ||
+                       gen_die 'bzip2 compression of iscsistart failed!'
+               mv "${TEMP}/${ISCSI_DIR}/usr/iscsistart.bz2" "${ISCSI_BINCACHE}" ||
+                       gen_die 'Could not copy the iscsistart binary to the package directory, does the directory exist?'
+
+               cd "${TEMP}"
+               rm -rf "${ISCSI_DIR}" > /dev/null
+       fi
+}
+

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index bba6f04a190a5adbf12d5b7f728acef60dd66a18..ebc6fdeef9d3685147573ab826212551c619aa43 100755 (executable)
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -101,6 +101,15 @@ config_kernel() {
                sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM is.*/CONFIG_BLK_DEV_DM=m/g'
        fi
 
+       # Make sure the iscsi modules are off if --iscsi
+       # CONFIG_SCSI_ISCSI_ATTRS
+       # CONFIG_ISCSI_TCP
+       if isTrue ${CMD_ISCSI}
+       then
+               sed -i ${KERNEL_DIR}/.config -e 's/^CONFIG_SCSI_ISCSI_ATTRS=\(.*\)/\# CONFIG_SCSI_ISCSI_ATTRS is not set/g'
+               sed -i ${KERNEL_DIR}/.config -e 's/^CONFIG_ISCSI_TCP=\(.*\)/\# CONFIG_ISCSI_TCP is not set/g'
+       fi
+
        if isTrue ${SPLASH}
        then
                sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_FB_SPLASH is.*/CONFIG_FB_SPLASH=y/g'

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index ed84798c14f0d0e105756788137b0f6204f127d0..d911f07a120c16122565e11d60b50b22fabdb2d3 100755 (executable)
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -103,6 +103,7 @@ determine_real_args() {
        set_config_with_override 1 LVM                  CMD_LVM
        set_config_with_override 1 EVMS                 CMD_EVMS
        set_config_with_override 1 DMRAID               CMD_DMRAID
+       set_config_with_override 1 ISCSI                CMD_ISCSI
        set_config_with_override 1 BUSYBOX              CMD_BUSYBOX              "yes"
        set_config_with_override 1 UNIONFS                              CMD_UNIONFS
        set_config_with_override 1 NETBOOT                              CMD_NETBOOT
@@ -128,6 +129,7 @@ determine_real_args() {
        DEVICE_MAPPER_BINCACHE=`cache_replace "${DEVICE_MAPPER_BINCACHE}"`
        LVM_BINCACHE=`cache_replace "${LVM_BINCACHE}"`
        DMRAID_BINCACHE=`cache_replace "${DMRAID_BINCACHE}"`
+       ISCSI_BINCACHE=`cache_replace "${ISCSI_BINCACHE}"`
        BLKID_BINCACHE=`cache_replace "${BLKID_BINCACHE}"`
        FUSE_BINCACHE=`cache_replace "${FUSE_BINCACHE}"`
        UNIONFS_FUSE_BINCACHE=`cache_replace "${UNIONFS_FUSE_BINCACHE}"`
@@ -138,6 +140,7 @@ determine_real_args() {
        DEVICE_MAPPER_BINCACHE=`arch_replace "${DEVICE_MAPPER_BINCACHE}"`
        LVM_BINCACHE=`arch_replace "${LVM_BINCACHE}"`
        DMRAID_BINCACHE=`arch_replace "${DMRAID_BINCACHE}"`
+       ISCSI_BINCACHE=`arch_replace "${ISCSI_BINCACHE}"`
        BLKID_BINCACHE=`arch_replace "${BLKID_BINCACHE}"`
        FUSE_BINCACHE=`arch_replace "${FUSE_BINCACHE}"`
        UNIONFS_FUSE_BINCACHE=`arch_replace "${UNIONFS_FUSE_BINCACHE}"`

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 07a7f5fe618b0526589570232d9a9cb6724ef90a..e4a1c4ac1a386415b43bbf04ce1c14befd8f7a1b 100755 (executable)
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -500,7 +500,7 @@ set_config_with_override() {
 }
 
 check_distfiles() {
-       for i in $BUSYBOX_SRCTAR $DEVICE_MAPPER_SRCTAR $MULTIPATH_SRCTAR $LVM_SRCTAR $DMRAID_SRCTAR $E2FSPROGS_SRCTAR
+       for i in $BUSYBOX_SRCTAR $DEVICE_MAPPER_SRCTAR $MULTIPATH_SRCTAR $LVM_SRCTAR $DMRAID_SRCTAR $E2FSPROGS_SRCTAR $ISCSI_SRCTAR
        do
                if [ ! -f "${i}" ]
                then

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 2809f610bb12359526954a0eb25ed373dd0796d3..30731a4792cbe8002c58d8038a489d9e7a1284c2 100755 (executable)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -199,6 +199,23 @@ append_dmraid(){
        rm -r "${TEMP}/initramfs-dmraid-temp/"
 }
 
+append_iscsi(){
+       if [ -d "${TEMP}/initramfs-iscsi-temp" ]
+       then
+               rm -r "${TEMP}/initramfs-iscsi-temp/"
+       fi
+       print_info 1 'ISCSI: Adding support (compiling binaries)...'
+       compile_iscsi
+       cd ${TEMP}
+       mkdir -p "${TEMP}/initramfs-iscsi-temp/bin/"
+       /bin/bzip2 -dc "${ISCSI_BINCACHE}" > "${TEMP}/initramfs-iscsi-temp/bin/iscsistart" ||
+               gen_die "Could not extract iscsi binary cache!"
+       chmod a+x "${TEMP}/initramfs-iscsi-temp/bin/iscsistart"
+       cd "${TEMP}/initramfs-iscsi-temp/"
+       find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
+       rm -rf "${TEMP}/initramfs-iscsi-temp" > /dev/null
+}
+
 append_lvm(){
        if [ -d "${TEMP}/initramfs-lvm-temp" ]
        then
@@ -590,6 +607,7 @@ create_initramfs() {
        append_data 'busybox' "${BUSYBOX}"
        append_data 'lvm' "${LVM}"
        append_data 'dmraid' "${DMRAID}"
+       append_data 'iscsi' "${ISCSI}"
        append_data 'evms' "${EVMS}"
        append_data 'mdadm' "${MDADM}"
        append_data 'luks' "${LUKS}"

diff --git a/genkernel b/genkernel
index ac3237f94f650d044b60a0e8eacfa7744a6c4ba3..767fe534fcba37e818685f4b47d1e94f7ace6a6f 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -348,6 +348,7 @@ then
        [ "${EVMS}" -eq '1' ] && print_info 1 'add "doevms" for evms support'
        [ "${DMRAID}" -eq '1' ] && print_info 1 'add "dodmraid" for dmraid support'
        [ "${DMRAID}" -eq '1' ] && print_info 1 '       or "dodmraid=<additional options>"'
+       [ "${ISCSI}" -eq '1' ] && print_info 1 'add "iscsi_i=<initiator name> iscsi_t=<target name> iscsi_a=<target ip>" for iscsi support'
 fi
 
 [ "${BOOTRW}" != '' ] && mount -o remount,ro ${BOOTDIR}

diff --git a/genkernel.conf b/genkernel.conf
index 1995b88aaffd00bfd6aaac45ac6d1cf176b68e84..ecf917c316a9258746315a4b026526e6fbcc21f4 100644 (file)
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -164,6 +164,11 @@ DMRAID_DIR="dmraid/${DMRAID_VER}"
 DMRAID_SRCTAR="${DISTDIR}/dmraid-${DMRAID_VER}.tar.bz2"
 DMRAID_BINCACHE="%%CACHE%%/dmraid-${DMRAID_VER}-%%ARCH%%.tar.bz2"
 
+ISCSI_VER="VERSION_ISCSI"
+ISCSI_DIR="open-iscsi-${ISCSI_VER}"
+ISCSI_SRCTAR="${DISTDIR}/open-iscsi-${ISCSI_VER}.tar.gz"
+ISCSI_BINCACHE="%%CACHE%%/iscsi-${ISCSI_VER}-%%ARCH%%.bz2"
+
 E2FSPROGS_VER="VERSION_E2FSPROGS"
 E2FSPROGS_DIR="e2fsprogs-${E2FSPROGS_VER}"
 E2FSPROGS_SRCTAR="${DISTDIR}/e2fsprogs-${E2FSPROGS_VER}.tar.gz"