summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2008-08-29 17:18:32 -1000
committerDavid Cantrell <dcantrell@redhat.com>2008-09-04 03:58:25 -1000
commit5b0433acbcbd66dac5a511d8b6c044d65ac5c2f2 (patch)
tree007f242153a09ae943acecc70e0f97f276c1073d /scripts
parent07f66bcf662ee37bf69deecf47be62ea90880e34 (diff)
downloadanaconda-5b0433acbcbd66dac5a511d8b6c044d65ac5c2f2.tar.gz
anaconda-5b0433acbcbd66dac5a511d8b6c044d65ac5c2f2.tar.xz
anaconda-5b0433acbcbd66dac5a511d8b6c044d65ac5c2f2.zip
Do not include /usr/lib/gconv in install.img
New NetworkManager appeared in rawhide that does not perform UTF-8 conversions on DHCP options, so we don't need to include /usr/lib/gconv in the install image.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/mk-images4
1 files changed, 0 insertions, 4 deletions
diff --git a/scripts/mk-images b/scripts/mk-images
index 287663b7c..d3ae21e69 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -554,7 +554,6 @@ makeinitrd() {
mkdir -p $MBD_DIR/etc/rc.d/init.d
mkdir -p $MBD_DIR/usr/sbin
mkdir -p $MBD_DIR/var/run/wpa_supplicant
- mkdir -p $MBD_DIR/usr/lib/gconv
if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then
mkdir -m 111 -p $MBD_DIR/var/empty/sshd
@@ -696,9 +695,6 @@ makeinitrd() {
cp -a org.freedesktop.nm_dispatcher.service $MBD_DIR/usr/share/dbus-1/system-services
)
- # gconv
- cp -a $IMGPATH/usr/lib/gconv/* $MBD_DIR/usr/lib/gconv
-
# Indirect dependencies
install -m 755 $IMGPATH/$LIBDIR/libnss_dns.so.2 $MBD_DIR/$LIBDIR/
install -m 755 $IMGPATH/$LIBDIR/libnss_files.so.2 $MBD_DIR/$LIBDIR/