summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordlehman <dlehman>2006-10-31 23:30:29 +0000
committerdlehman <dlehman>2006-10-31 23:30:29 +0000
commit72ee842fa5764749f7f60c79ced9daea968a34e3 (patch)
treefa43d4682803f6ac85e8ba6e07bfe70616aa4681
parent59b734e780bfdbe13a19eb6b3af8938dcde03806 (diff)
downloadanaconda-72ee842fa5764749f7f60c79ced9daea968a34e3.tar.gz
anaconda-72ee842fa5764749f7f60c79ced9daea968a34e3.tar.xz
anaconda-72ee842fa5764749f7f60c79ced9daea968a34e3.zip
2006-10-31 Dave Lehman <dlehman@redhat.com>
* scripts/upd-instroot: add audit-libs to PACKAGES (#203391) * scripts/upd-instroot: remove ineffectual /bin/echo symlink * scripts/mk-images: symlink /bin/echo->/usr/bin/echo (#178781)
-rw-r--r--ChangeLog7
-rwxr-xr-xscripts/mk-images1
-rwxr-xr-xscripts/upd-instroot3
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 365d4497a..de3dbdaf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-31 Dave Lehman <dlehman@redhat.com>
+
+ * scripts/upd-instroot: add audit-libs to PACKAGES (#203391)
+
+ * scripts/upd-instroot: remove ineffectual /bin/echo symlink
+ * scripts/mk-images: symlink /bin/echo->/usr/bin/echo (#178781)
+
2006-10-23 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version.
diff --git a/scripts/mk-images b/scripts/mk-images
index 758bf049c..3e09d2f3d 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -470,6 +470,7 @@ EOF
# make some symlinks
ln -sf bash $MBD_DIR/sbin/sh
+ ln -sf /usr/bin/echo $MBD_DIR/bin/echo
(cd $MBD_DIR/sbin;
set $(./busybox 2>&1| awk '/^\t([[:alnum:]_\[]+,)+/' | sed 's/,//g' | sed 's/ +//');
while [ -n "$1" ]; do
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 69838d20e..08d7b876a 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -116,7 +116,7 @@ PACKAGES="glibc glibc-common setup openssl python newt slang libselinux
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
+ rhpl pyxf86config libxml2 libxml2-python glib2 audit-libs
elfutils-libelf bogl-bterm bogl krb5-libs convertdb1 jfsutils
xfsprogs xfsdump dmapi libacl libattr attr acl
policy policycoreutils pyparted xorg-x11 selinux-policy-targeted"
@@ -1016,7 +1016,6 @@ 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"