summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2006-04-19 20:23:09 +0000
committerPeter Jones <pjones@redhat.com>2006-04-19 20:23:09 +0000
commit7e45124a77f1a9a65f884a373566bc6cdf396ff3 (patch)
tree57054f06806eeff6d8025c432e431758a5ecf3d9
parent6c62334e79fdd1ce7f75bc685405ca144e398634 (diff)
downloadanaconda-7e45124a77f1a9a65f884a373566bc6cdf396ff3.tar.gz
anaconda-7e45124a77f1a9a65f884a373566bc6cdf396ff3.tar.xz
anaconda-7e45124a77f1a9a65f884a373566bc6cdf396ff3.zip
- dd readline and ncurses to non-GR images. (#177471).
- add symlink for /bin/echo (#178781)
-rw-r--r--ChangeLog3
-rwxr-xr-xscripts/upd-instroot5
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7568a2db3..828a849a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
* isys/linkdetect.c (get_link_status): don't leak socket fd.
* loader2/loader.c: add post_link_sleep and "nicdelay=" option.
* loader2/net.c (waitForLink): handle post_link_sleep
+ * scripts/upd-instroot: add readline and ncurses to non-GR
+ images. (#177471).
+ add symlink for /bin/echo (#178781)
2006-04-17 Peter Jones <pjones@redhat.com>
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 2c7256030..69838d20e 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -113,7 +113,7 @@ mkdir -p $DESTGR
PACKAGES="glibc glibc-common setup openssl python newt slang libselinux
libsepol libtermcap zlib ash e2fsprogs util-linux raidtools popt mdadm
procps rpm rpm-libs XFree86 Xconfigurator anaconda tzdata
- anaconda-runtime kudzu hwdata bzip2 beecrypt
+ anaconda-runtime kudzu hwdata bzip2 beecrypt ncurses readline
bzip2-libs dosfstools pciutils reiserfs-utils parted sed
busybox-anaconda rpm-python booty hdparm lvm2 beecrypt device-mapper
rhpl pyxf86config libxml2 libxml2-python glib2
@@ -348,10 +348,12 @@ usr/$LIBDIR/libssl*
usr/$LIBDIR/libcrypto*
usr/$LIBDIR/libbz2*
usr/$LIBDIR/libelf*
+usr/$LIBDIR/libncurses*
usr/$LIBDIR/libnewt*
usr/$LIBDIR/libparted*
usr/$LIBDIR/libpopt*
usr/$LIBDIR/libpython*
+usr/$LIBDIR/libreadline*
usr/$LIBDIR/librpm-*4.?.so*
usr/$LIBDIR/librpmdb*4.?.so*
usr/$LIBDIR/librpmio*4.?.so*
@@ -1014,6 +1016,7 @@ for p in $DEST $DESTGR; do
else
ln -s ash $p/bin/sh
fi
+ ln -s /usr/bin/echo $p/bin/echo
[ -d $p/bin ] || die "ERROR: directory missing: $p/bin"
[ -d $p/sbin ] || die "ERROR: directory missing: $p/sbin"