Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added ATA over Ethernet support #32

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added ATA over Ethernet support #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions arch/x86_64/modules_load
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ MODULES_NET="e1000 tg3"
# iSCSI support
MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"

# AOE support
MODULES_AOE="aoe"

# Hardware (Pluggable)
MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"
Expand Down
26 changes: 26 additions & 0 deletions defaults/initrd.d/00-aoe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/bin/sh

. /etc/initrd.d/00-common.sh

start_aoe() {
[ "${USE_AOE}" = "1" ] || return 0

if [ ! -c /dev/etherd/discover ]; then
bad_msg "Module aoe not loaded"
return 0
fi

good_msg "Bringing up all interfaces for AOE discovery"
for iface in /sys/class/net/* ; do ifconfig `basename $iface` up ; done

for blk in $AOE_WAIT ; do
good_msg "Waiting for $blk to be discovered"
while [ ! -b "/dev/etherd/$blk" ] ; do
echo > /dev/etherd/discover
sleep 1
done
done

return 0
}

4 changes: 2 additions & 2 deletions defaults/initrd.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,5 @@ DEFAULT_NFSOPTIONS="ro,nolock,rsize=1024,wsize=1024"

# 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 lvm dmraid mdadm fs net virtio hyperv"
MY_HWOPTS="modules pata sata scsi usb firewire waitscan dmraid mdadm fs net iscsi crypto plymouth virtio"
HWOPTS="keymap cache modules pata sata scsi usb firewire waitscan lvm dmraid mdadm fs net virtio hyperv aoe"
MY_HWOPTS="modules pata sata scsi usb firewire waitscan dmraid mdadm fs net iscsi crypto plymouth virtio aoe"
1 change: 1 addition & 0 deletions defaults/initrd.scripts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
. /etc/initrd.d/00-crypt.sh
. /etc/initrd.d/00-suspend.sh
. /etc/initrd.d/00-iscsi.sh
. /etc/initrd.d/00-aoe.sh
. /etc/initrd.d/00-rootdev.sh
11 changes: 10 additions & 1 deletion defaults/linuxrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,14 @@ for x in ${CMDLINE}; do
iscsi_noibft)
ISCSI_NOIBFT=1
;;

doaoe)
USE_AOE=1
AOE_WAIT="${AOE_WAIT-}"
;;
doaoe=*)
USE_AOE=1
AOE_WAIT="$AOE_WAIT ${x#*=}"
;;
crypt_root=*)
# kept for backward compatibility
CRYPT_ROOTS=${x#*=}
Expand Down Expand Up @@ -294,6 +301,8 @@ cd /

start_iscsi

start_aoe

start_volumes
zfs_start_volumes

Expand Down
2 changes: 2 additions & 0 deletions defaults/modules_load
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ MODULES_NET="e1000 tg3"
# iSCSI support
MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"

MODULES_AOE="aoe"

# Hardware (Pluggable)
MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"
Expand Down