home: hub: mkinitfs

Info  •  Files  •  Log

Merge branch 'zfcp' into 'master'

mkinitfs: add zFCP SCSI device as root disk on s390x

See merge request alpine/mkinitfs!71

--- a/Makefile

+++ b/Makefile

@@ -56,6 +56,7 @@

 		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 @@

 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

--- /dev/null

+++ b/features.d/zfcp.modules

@@ -1,0 +1,1 @@

+kernel/drivers/s390/scsi/zfcp*

--- a/initramfs-init.in

+++ b/initramfs-init.in

@@ -334,7 +334,7 @@

 	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

@@ -399,6 +399,13 @@

 	do_networking=true

 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

--- a/mkinitfs-bootparam.7.in

+++ b/mkinitfs-bootparam.7.in

@@ -44,6 +44,9 @@

 \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