summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--loader/Makefile.am2
-rw-r--r--loader/linuxrc.s3902
-rwxr-xr-xscripts/mk-images1
3 files changed, 3 insertions, 2 deletions
diff --git a/loader/Makefile.am b/loader/Makefile.am
index 575c35d5a..5734c5cd2 100644
--- a/loader/Makefile.am
+++ b/loader/Makefile.am
@@ -27,7 +27,7 @@ noinst_HEADERS = *.h
if IS_S390
boot_PROGRAMS += shutdown
-dist_boot_SCRIPTS = linuxrc.s390 lsznet.raw
+dist_boot_SCRIPTS = linuxrc.s390 lsznet.raw controlunits.sh
else
boot_PROGRAMS += init
endif
diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390
index 260e3930a..b9d44a6d2 100644
--- a/loader/linuxrc.s390
+++ b/loader/linuxrc.s390
@@ -462,7 +462,7 @@ declare -r BUSIDFORMAT=[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]
declare -r IDFORMAT=$PREFIXFORMAT.$SSIDFORMAT.$BUSIDFORMAT
declare -r SUBCHANNEL_TYPE_IO=0
-. /sbin/controlunits.sh
+. /sbin/controlunits
function cardtype2cleartext() {
local cardtype=$1
diff --git a/scripts/mk-images b/scripts/mk-images
index 44b430db0..56a7a88da 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -595,6 +595,7 @@ makeinitrd() {
instbin $IMGPATH ${LOADERBINDIR##IMGPATH}/shutdown $MBD_DIR /sbin/shutdown
instbin $IMGPATH /usr/lib/anaconda-runtime/loader/linuxrc.s390 $MBD_DIR /sbin/init
instbin $IMGPATH /usr/lib/anaconda-runtime/loader/lsznet.raw $MBD_DIR /sbin/lsznet
+ instbin $IMGPATH /usr/lib/anaconda-runtime/loader/controlunits.sh $MBD_DIR /sbin/controlunits
instbin $IMGPATH /usr/sbin/dasdfmt $MBD_DIR /sbin/dasdfmt
fi