[PATCH 5/5] Make sure controlunits.sh is installed to initrd on s390

[David Cantrell <dcantrell redhat com>]

Put controlunits.sh in /usr/lib/anaconda-runtime/loader on s390, install
as /sbin/controlunits in the initrd.img, modify linuxrc.s390 to source
/sbin/controlunits.
---
 loader/Makefile.am  |    2 +-
 loader/linuxrc.s390 |    2 +-
 scripts/mk-images   |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/loader/Makefile.am b/loader/Makefile.am
index 575c35d..5734c5c 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 260e393..b9d44a6 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 44b430d..56a7a88 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
 
-- 
1.6.2.5