summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSteffen Maier <maier@linux.vnet.ibm.com>2009-08-23 18:10:30 +0200
committerDavid Cantrell <dcantrell@redhat.com>2009-08-24 18:34:44 -1000
commit8fc0b6f9e1ebd7196eeaf8d4aa40a6e4fcc0cacf (patch)
tree113325c40a36bd21cfe4633997165a04d35f2004 /scripts
parentb9ee1a9349c95d9fc040b0a1c22ed7e780fbf37c (diff)
downloadanaconda-8fc0b6f9e1ebd7196eeaf8d4aa40a6e4fcc0cacf.tar.gz
anaconda-8fc0b6f9e1ebd7196eeaf8d4aa40a6e4fcc0cacf.tar.xz
anaconda-8fc0b6f9e1ebd7196eeaf8d4aa40a6e4fcc0cacf.zip
Ensure libraries are copied to initrd.img for xauth (#516369)
And while we're at it, also fix it for dynamically linked cmsfs* binaries.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/mk-images8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/mk-images b/scripts/mk-images
index 66c805709..bd24a2339 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -572,8 +572,12 @@ makeinitrd() {
cp $IMGPATH/$LIBDIR/libpam_misc.so.0.* $MBD_DIR/$LIBDIR/libpam_misc.so.0
cp $IMGPATH/$LIBDIR/libwrap*.so* $MBD_DIR/$LIBDIR/
ln -s /tmp $MBD_DIR/var/state/xkb
- cp $IMGPATH/usr/bin/xauth $MBD_DIR/sbin/xauth
- cp $IMGPATH/usr/sbin/cmsfs* $MBD_DIR/sbin/
+ instbin $IMGPATH /usr/bin/xauth $MBD_DIR /sbin/xauth
+ local cmsfsbin cmd
+ for cmsfsbin in /usr/sbin/cmsfs*; do
+ cmd="$(basename $cmsfsbin)"
+ instbin $IMGPATH /usr/sbin/$cmd $MBD_DIR /sbin/$cmd
+ done
fi
if [ -n "$INITRDMODULES" ]; then