From 0d83e17f7da3fbc92100523660fbde686ef15c5c Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@redhat.com>
Date: Mon, 27 Jul 2009 11:03:28 -1000
Subject: Make sure controlunits.sh is installed to initrd on s390

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 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'loader')

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