Use lsznet.raw from s390utils package (#563548).

The lsznet.raw and controlunits.sh files are now part of the s390-tools
project, which is in the s390utils package.  Remove our copies and make
sure we use the ones from the s390utils package.

2 files changed, 9 insertions, 2 deletions

diff --git a/scripts/mk-images b/scripts/mk-images
index eaf62705e..92121b9ea 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -605,6 +605,13 @@ makeinitrd() {
             instbin $IMGPATH /usr/sbin/$cmd $MBD_DIR /sbin/$cmd
         done
 
+        # lsznet requirements
+        mkdir -p $MBD_DIR/lib/s390-tools
+        for lsznetbin in lsznet.raw znetcontrolunits ; do
+            target="/lib/s390-tools/$lsznetbin"
+            instbin $IMGPATH $target $MBD_DIR $target
+        done
+
         # required for lsznet
         instbin $IMGPATH /usr/bin/sort $MBD_DIR /sbin/sort
 
@@ -648,8 +655,6 @@ makeinitrd() {
     else
         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
 
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index a6c65eea9..ec57f316f 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -711,6 +711,8 @@ bin/tar
 bin/uname
 bin/vi
 lib/modules/ibm
+lib/s390-tools/lsznet.raw
+lib/s390-tools/znetcontrolunits
 lib/security
 sbin/arp
 sbin/cmsfscat