diff options
-rwxr-xr-x | initramfs/initrd-stuff/init | 16 | ||||
-rwxr-xr-x | initramfs/mkdxsinitrd | 16 |
2 files changed, 30 insertions, 2 deletions
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index 00ab5567..0c08813a 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -2,7 +2,7 @@ # main script for new type of initial ramdisk for OpenSLX linux diskless # clients version 4 # -# Dirk von Suchodoletz <dirk@goe.net>, 07-09-2006 +# Dirk von Suchodoletz <dirk@goe.net>, 15-10-2006 # <mj0@uni-freiburg.de> (xenbr), 27-09-2006 # # (c) 2006 - RZ Universitaet Freiburg @@ -156,6 +156,9 @@ line in $0\nnfsroot=\"${NFSROOT}\"\n" >> /etc/machine-setup ;; iscsi) echo "Not implemented yet" + #iscsiserver=$(uri_token $ROOTFS server) + #iscsiport=$(uri_token $ROOTFS port) + #iscsitarget=$(uri_token $ROOTFS path) ;; esac ;; @@ -339,6 +342,17 @@ if [ -n "${nbdmod}" ] ; then usleep $i mount -n -t $nbdrfst -o $RWRO $RDEV /mnt 2>/dev/null && break done +elif [ -n ${iscsiserver} ] ; then + : + #if [ -n ${iscsitarget} ] ; then + # echo "InitiatorName=${iscsitarget}">/etc/initiatorname.iscsi + #else + # discovery + #fi + #echo -e "node.startup = automatic">/etc/iscsid.conf + #iscsid -c /etc/iscsid.conf + # the cowloop part has to be moved (option for iscsi devices too) + # and should be generalized for nbd, dnbd, iscsi fi # if no type of root filesystem is passed via kernel command line try diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd index a2df3539..df701573 100755 --- a/initramfs/mkdxsinitrd +++ b/initramfs/mkdxsinitrd @@ -4,7 +4,7 @@ # ramdisks for linux diskless clients (stage2 system # setup) # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 03-10-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 15-10-2006 # Nico Dietrich # Felix Endres # <mj0@uni-freiburg.de> (xenbr), 27-09-2006 @@ -566,6 +566,10 @@ cobi unionctl bin &>/dev/null || \ cobi cowdev bin &>/dev/null || \ echo "Program cowdev not found; could be ignored ..." +# if iscsi (or just with modules)?? +# cobi iscsiadm iscsid bin &>/dev/null || \ +# echo "Program cowdev not found; could be ignored ..." + # distro specific additional stuff case "${DISTRO}" in debian*) @@ -660,6 +664,7 @@ for module in af_packet unix ${NWMODULES} ${FSMODULES} ${MISCMODULES} \ ${ddirprefix}/fs/jbd ;; netloop) + # needed for xen stuff cobi brctl bin &>/dev/null || \ echo "Program brctl not found; could be ignored ..." mkdir -p ${ddirprefix}/drivers/xen/netback @@ -669,6 +674,15 @@ for module in af_packet unix ${NWMODULES} ${FSMODULES} ${MISCMODULES} \ cp ${rdirprefix}/net/bridge/bridge.ko \ ${ddirprefix}/net/bridge &>/dev/null ;; + iscsi_tcp) + # iscsi modules + # cobi cobi iscsiadm iscsid bin &>/dev/null + #mkdir -p ${ddirprefix}/drivers/scsi + #for i in scsi_mod scsi_transport_iscsi libiscsi iscsi_tcp; do + # cp ${rdirprefix}/drivers/scsi/$i.ko + # ${ddirprefix}/drivers/scsi + #done + ;; esac fi done |