'cp -a' considered harmful. jkeating brought to my attention today that
libgio-2.0.so.0 was not getting copying in to the initrd.img which is
required by libnm-settings-plugin-ifcfg-rh.so.
The problem was caused by my patch to mk-images which changed the plugin
instbin line to a 'cp -a' for the *.so files in
/usr/$LIBDIR/NetworkManager.
We need to use the instbin function so that get_dso_deps() is run on the
plugin files and we pick up dependent libraries.
---
scripts/mk-images | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/scripts/mk-images b/scripts/mk-images
index 496a7c8..9e68fac 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -698,7 +698,11 @@ makeinitrd() {
cp -a $IMGPATH/etc/dbus-1/system.d/nm-*.conf
$MBD_DIR/etc/dbus-1/system.d
cp -a $IMGPATH/etc/dbus-1/system.d/NetworkManager.conf
$MBD_DIR/etc/dbus-1/system.d
cp -a $IMGPATH/etc/NetworkManager/nm-system-settings.conf
$MBD_DIR/etc/NetworkManager
- cp -a $IMGPATH/usr/$LIBDIR/NetworkManager/*.so
$MBD_DIR/usr/$LIBDIR/NetworkManager
+ ( cd $IMGPATH/usr/$LIBDIR/NetworkManager
+ for f in *.so ; do
+ instbin $IMGPATH /usr/$LIBDIR/NetworkManager/$f $MBD_DIR
/usr/$LIBDIR/NetworkManager/$f
+ done
+ )
( cd $IMGPATH/usr/libexec
for f in nm-* ; do
instbin $IMGPATH /usr/libexec/$f $MBD_DIR /usr/libexec/$f