diff options
author | David Cantrell <dcantrell@redhat.com> | 2009-07-27 11:03:28 -1000 |
---|---|---|
committer | David Cantrell <dcantrell@redhat.com> | 2009-07-28 14:27:56 -1000 |
commit | 0d83e17f7da3fbc92100523660fbde686ef15c5c (patch) | |
tree | 5d29652710cc5be45629b0eb2e6dd1c0a002f6d2 /loader | |
parent | ff0c3ca0990ed45422d1ff48452a42de9cc3eda2 (diff) | |
download | anaconda-0d83e17f7da3fbc92100523660fbde686ef15c5c.tar.gz anaconda-0d83e17f7da3fbc92100523660fbde686ef15c5c.tar.xz anaconda-0d83e17f7da3fbc92100523660fbde686ef15c5c.zip |
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.
Diffstat (limited to 'loader')
-rw-r--r-- | loader/Makefile.am | 2 | ||||
-rw-r--r-- | loader/linuxrc.s390 | 2 |
2 files changed, 2 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 |