Add back missing programs necessary for linuxrc.s390 and lsznet, plus
additional programs that make installation on s390 slightly more
enjoyable.
In mk-images, note which tools are required by which scripts and which
are just there to make life easier.
---
scripts/mk-images | 23 ++++++++++++
scripts/upd-instroot | 91 ++++++++++++++++++++++++++++++++++++-------------
2 files changed, 90 insertions(+), 24 deletions(-)
diff --git a/scripts/mk-images b/scripts/mk-images
index df1b84a..b3e016c 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -583,6 +583,29 @@ makeinitrd() {
cmd="$(basename $cmsfsbin)"
instbin $IMGPATH /usr/sbin/$cmd $MBD_DIR /sbin/$cmd
done
+
+ # required for lsznet
+ instbin $IMGPATH /usr/bin/sort $MBD_DIR /sbin/sort
+
+ # required for lsznet and linuxrc.s390
+ instbin $IMGPATH /usr/bin/uname $MBD_DIR /sbin/uname
+ instbin $IMGPATH /usr/bin/find $MBD_DIR /sbin/find
+
+ # required for linuxrc.s390
+ for cmd in ping ping6 cat head tr wc echo printf cut mknod ; do
+ instbin $IMGPATH /usr/bin/$cmd $MBD_DIR /sbin/$cmd
+ done
+ instbin $IMGPATH /usr/sbin/sysctl $MBD_DIR /sbin/sysctl
+
+ # usability and problem determination
+ for cmd in cp chown chmod date dmesg ps ls less vi gzip tar scp \
+ ldd nslookup expr getopt basename dirname lsscsi ; do
+ instbin $IMGPATH /usr/bin/$cmd $MBD_DIR /sbin/$cmd
+ done
+ for cmd in arp qetharp qetharp-2.6 qethconf lsqeth lscss lschp \
+ lsreipl lsdasd dasdview dasdinfo lszfcp ; do
+ instbin $IMGPATH /usr/sbin/$cmd $MBD_DIR /sbin/$cmd
+ done
fi
if [ -n "$INITRDMODULES" ]; then
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 5534520..6864586 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -221,11 +221,11 @@ if [ $ARCH = ia64 ]; then
fi
if [ $ARCH = s390 -o $ARCH = s390x ]; then
- PACKAGES="$PACKAGES s390utils binutils libgcc tcp_wrappers
- sed net-tools openssh openssh-server coreutils
- login initscripts portmap pam
- login mount modutils s390utils-cmsfs
- strace xorg-x11-xauth xorg-x11-libs"
+ PACKAGES="bind-utils binutils coreutils findutils gzip initscripts
+ iputils less libgcc login lsscsi modutils mount net-tools
+ openssh openssh-clients openssh-server pam portmap s390utils
+ s390utils-base s390utils-cmsfs sed strace tar tcp_wrappers
+ xorg-x11-libs xorg-x11-xauth"
fi
if [ $ARCH = ppc -o $ARCH = ppc64 ]; then
@@ -663,6 +663,68 @@ EOF
if [ $ARCH = s390 -o $ARCH = s390x ]; then
cat >> $KEEPFILE <<EOF
+bin/basename
+bin/cat
+bin/chmod
+bin/chown
+bin/cp
+bin/cut
+bin/date
+bin/dmesg
+bin/echo
+bin/find
+bin/gzip
+bin/login
+bin/ls
+bin/mknod
+bin/ping
+bin/ping6
+bin/ps
+bin/sort
+bin/tar
+bin/uname
+bin/vi
+etc/pam.d/other
+etc/pam.d/sshd
+etc/security/limits.conf
+etc/security/pam_env.conf
+$LIBDIR/libwrap*.so*
+$LIBDIR/security/pam_*
+lib/modules/ibm
+lib/security
+sbin/arp
+sbin/cmsfscat
+sbin/cmsfslst
+sbin/dasdfmt
+sbin/dasdinfo
+sbin/dasdview
+sbin/fdasd
+sbin/lschp
+sbin/lscss
+sbin/lsdasd
+sbin/lsqeth
+sbin/lsreipl
+sbin/lszfcp
+sbin/portmap
+sbin/qetharp*
+sbin/qethconf
+sbin/sysctl
+usr/bin/dirname
+usr/bin/expr
+usr/bin/getopt
+usr/bin/head
+usr/bin/ldd
+usr/bin/less
+usr/bin/lsscsi
+usr/bin/nslookup
+usr/bin/printf
+usr/bin/scp
+usr/bin/strace
+usr/bin/tr
+usr/bin/wc
+usr/bin/xauth
+usr/sbin/glibc_post_upgrade
+usr/sbin/sshd
usr/share/terminfo/a/ansi
usr/share/terminfo/d/dumb
usr/share/terminfo/k/kterm
@@ -672,25 +734,6 @@ usr/share/terminfo/v/vt320
usr/share/terminfo/v/vt320-w
usr/share/terminfo/x/xterm
usr/share/terminfo/x/xterm-color
-usr/bin/strace
-usr/bin/ldd
-usr/sbin/sshd
-usr/sbin/glibc_post_upgrade
-sbin/cmsfslst
-sbin/cmsfscat
-sbin/portmap
-sbin/fdasd
-sbin/dasdfmt
-bin/login
-lib/modules/ibm
-etc/pam.d/sshd
-etc/pam.d/other
-etc/security/limits.conf
-etc/security/pam_env.conf
-lib/security
-$LIBDIR/security/pam_*
-$LIBDIR/libwrap*.so*
-usr/bin/xauth
EOF
fi
--
1.6.2.2
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
