diff options
author | Jeremy Katz <katzj@redhat.com> | 2003-04-24 15:46:31 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2003-04-24 15:46:31 +0000 |
commit | 0a562126d84c59a113231ae7ab38984f92d62153 (patch) | |
tree | 5e87b9094f4ebdc328979e3a0640dee5f1fc40cb /scripts/upd-instroot | |
parent | dd200d781bd9012f562399c2ee69c23fe60d86b9 (diff) | |
download | anaconda-0a562126d84c59a113231ae7ab38984f92d62153.tar.gz anaconda-0a562126d84c59a113231ae7ab38984f92d62153.tar.xz anaconda-0a562126d84c59a113231ae7ab38984f92d62153.zip |
another taroon merge. tagged before as before-taroon-merge, after as
after-taroon-merge
this one adds s390 fixes, basic i/p series platform support, support for
multiple kernels and one second stage, cmdline kickstart mode (nice for s390),
some warning cleanups.
Diffstat (limited to 'scripts/upd-instroot')
-rwxr-xr-x | scripts/upd-instroot | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 6cda83c06..4569487e9 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -104,7 +104,7 @@ PACKAGES="glibc glibc-common setup openssl python python2 newt slang bzip2-libs dosfstools pciutils reiserfs-utils parted sed busybox-anaconda rpm-python booty hdparm lvm rhpl pyxf86config libxml2 libxml2-python glib2 - elfutils-libelf bogl-bterm bogl krb5-libs convertdb1" + elfutils-libelf bogl-bterm bogl krb5-libs convertdb1 jfsutils" if [ $ARCH = i386 -o $ARCH = x86_64 ]; then PACKAGES="$PACKAGES kernel-pcmcia-cs kernel-utils" @@ -118,8 +118,12 @@ if [ $ARCH = s390 -o $ARCH = s390x ]; then PACKAGES="$PACKAGES s390utils binutils libgcc tcp_wrappers sed net-tools xinetd openssl openssh openssh-server coreutils login initscripts XFree86-xauth bash portmap pam - libcrack telnet-server login mount grep modutils gawk - XFree86-libs" + telnet-server login mount grep modutils gawk + XFree86-libs strace" +fi + +if [ $ARCH = ppc -o $ARCH = ppc64 ]; then + PACKAGES="$PACKAGES kernel-pcmcia-cs pdisk yaboot hfsutils" fi # xpm is missing @@ -184,7 +188,7 @@ if [ $ARCH = ia64 ]; then fi if [ $ARCH = ppc ]; then - PACKAGESGR="$PACKAGESGR fbset" + PACKAGESGR="$PACKAGESGR fbset yaboot ppc64-utils" fi # @@ -207,7 +211,7 @@ etc/group etc/passwd etc/protocols etc/services -$LIBDIR/ld-* +$LIBDIR/ld*.so* $LIBDIR/libc* $LIBDIR/libcom_err* $LIBDIR/libcrypt* @@ -264,6 +268,7 @@ sbin/mkreiserfs sbin/mkraid sbin/mkswap sbin/parted +sbin/pdisk sbin/pvchange sbin/pvcreate sbin/pvdata @@ -293,6 +298,11 @@ sbin/vgsplit usr/X11R6/share/Xconfigurator/MonitorsDB usr/bin/python usr/bin/python2.2 +usr/bin/hmount +usr/bin/humount +usr/bin/hcopy +usr/bin/hattrib +usr/bin/hformat usr/lib/anaconda-runtime/* usr/lib/anaconda/* usr/lib/anaconda/installclasses/* @@ -333,11 +343,17 @@ usr/$LIBDIR/python2.2/site-packages/rhpl usr/lib/rpm/macros usr/lib/rpm/rpmpopt usr/lib/rpm/rpmrc +usr/lib/yaboot/addnote +usr/lib/yaboot/ofboot +usr/lib/yaboot/yaboot usr/libexec/convertdb1 usr/share/locale/*/LC_MESSAGES/anaconda.mo usr/sbin/anaconda usr/sbin/ddcprobe usr/sbin/dmidecode +usr/sbin/mkofboot +usr/sbin/ofpath +usr/sbin/ybin usr/share/anaconda/locale-list usr/share/anaconda/anaconda.conf usr/share/terminfo/b/bterm @@ -356,6 +372,7 @@ if [ $ARCH = s390 -o $ARCH = s390x ]; then cat >> $KEEPFILE <<EOF usr/share/terminfo/a/ansi usr/share/terminfo/d/dumb +usr/share/terminfo/k/kterm usr/share/terminfo/s/screen usr/share/terminfo/v/vt100 usr/share/terminfo/v/vt100-nav @@ -364,22 +381,12 @@ usr/share/terminfo/x/xterm usr/share/terminfo/x/xterm-color usr/bin/strace usr/bin/ldd -usr/bin/wget -usr/bin/printf -usr/bin/dasdformat -usr/bin/formatmnt -usr/bin/mountpoint -usr/bin/netsetup -usr/bin/pkgselect -usr/bin/pkgsrc usr/sbin/chroot usr/sbin/sshd usr/sbin/glibc_post_upgrade usr/sbin/in.telnetd usr/sbin/xinetd sbin/busybox.anaconda -sbin/consoletype -sbin/rhsetup sbin/ifconfig sbin/route sbin/portmap @@ -388,7 +395,6 @@ sbin/dasdfmt sbin/swapon sbin/swapoff sbin/mkswap -sbin/tune2fs bin/bash bin/dd bin/gawk @@ -399,7 +405,6 @@ bin/login bin/cat bin/chmod bin/sort -bin/rpm $LIBDIR/libpam.so* $LIBDIR/libdl.so* $LIBDIR/libdl-*.so* @@ -419,16 +424,12 @@ $LIBDIR/libresolv-*.so* $LIBDIR/libvtoc*.so* lib/modules/ibm/* etc/xinetd.conf -etc/xinetd.d/telnet etc/pam.d/sshd -etc/pam.d/login -etc/pam.d/system-auth etc/pam.d/other etc/security/limits.conf etc/security/pam_env.conf lib/security $LIBDIR/security/pam_* -usr/$LIBDIR/libcrack.so* usr/$LIBDIR/libwrap.so* usr/X11R6/$LIBDIR/libXmuu.so* usr/X11R6/$LIBDIR/libX11.so* @@ -478,8 +479,10 @@ etc/man.config etc/pango/* etc/fonts/* $LIBDIR/libnss_dns* +$LIBDIR/libnss_nis* $LIBDIR/libpam* $LIBDIR/libproc* +sbin/addRamDisk sbin/debugfs sbin/e2fsck sbin/e2label @@ -568,6 +571,7 @@ usr/$LIBDIR/pango/* usr/$LIBDIR/python2.2/site-packages/gtk*/gtk/* usr/$LIBDIR/rpm/rpmpopt usr/lib/syslinux/* +usr/lib/yaboot/* usr/sbin/chroot usr/sbin/ddcprobe usr/sbin/fbset |