Commit 49043d91 authored by Natanael Copa's avatar Natanael Copa

Merge branch 'zfcp' into 'master'

mkinitfs: add zFCP SCSI device as root disk on s390x

See merge request !71
parents 8ca91e73 9f33719a
......@@ -56,6 +56,7 @@ CONF_FILES := mkinitfs.conf \
features.d/zfs.modules \
features.d/qeth.modules \
features.d/dasd_mod.modules \
features.d/zfcp.modules \
features.d/dhcp.files \
features.d/https.files
MAN_FILES := mkinitfs.1 mkinitfs-bootparam.7 nlplug-findfs.1
......@@ -82,7 +83,7 @@ SED_REPLACE := -e 's:@VERSION@:$(FULL_VERSION):g' \
DEFAULT_FEATURES ?= ata base cdrom ext4 keymap kms mmc nvme raid scsi usb virtio
ifeq ($(shell uname -m), s390x)
DEFAULT_FEATURES += qeth dasd_mod
DEFAULT_FEATURES += qeth dasd_mod zfcp
endif
......
kernel/drivers/s390/scsi/zfcp*
......@@ -334,7 +334,7 @@ myopts="alpine_dev autodetect autoraid chart cryptroot cryptdm cryptheader crypt
cryptdiscards cryptkey debug_init dma init init_args keep_apk_new modules ovl_dev
pkgs quiet root_size root usbdelay ip alpine_repo apkovl alpine_start splash
blacklist overlaytmpfs rootfstype rootflags nbd resume s390x_net dasd ssh_key
BOOTIF"
BOOTIF zfcp"
for opt; do
case "$opt" in
......@@ -401,6 +401,13 @@ else
do_networking=false
fi
if [ -n "$KOPT_zfcp" ]; then
modprobe zfcp
for _zfcp in $(echo "$KOPT_zfcp" | tr ',' ' ' | tr [A-Z] [a-z]); do
echo 1 > /sys/bus/ccw/devices/"${_zfcp%%:*}"/online
done
fi
if [ -n "$KOPT_dasd" ]; then
for mod in dasd_mod dasd_eckd_mod dasd_fba_mod; do
modprobe $mod
......
......@@ -44,6 +44,9 @@ Attempt to decrypt \fIDEVICE\fR.
\fBdasd\fR
Enable DASD devices on S/390x architectures.
.TP
\fBzfcp\fR
Enable zFCP SCSI devices on S/390x architectures.
.TP
\fBdebug_init\fR
Print debug information during boot.
.TP
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment