[PATCH] Ensure libraries are copied to initrd.img for xauth (#516369)

[Steffen Maier <maier@xxxxxxxxxxxxxxxxxx>]

And while we're at it, also fix it for dynamically linked cmsfs* binaries.
---
 scripts/mk-images |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/mk-images b/scripts/mk-images
index 66c8057..bd24a23 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
-- 
1.6.4



_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list