[PATCH rhel6-branch] NetworkManager uses a different config file now (#623937).

[Chris Lumens <clumens@xxxxxxxxxx>]

We now need to include NetworkManager.conf instead of nm-system-settings.conf
due to a packaging change.
---
 scripts/mk-images    |    2 +-
 scripts/upd-instroot |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/mk-images b/scripts/mk-images
index a4424c7..d5bacc9 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -793,7 +793,7 @@ makeinitrd() {
     instbin $IMGPATH /usr/sbin/NetworkManager $MBD_DIR /usr/sbin/NetworkManager
     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/etc/NetworkManager/NetworkManager.conf $MBD_DIR/etc/NetworkManager
     ( cd $IMGPATH/usr/$LIBDIR/NetworkManager
       for f in *.so ; do
           instbin $IMGPATH /usr/$LIBDIR/NetworkManager/$f $MBD_DIR /usr/$LIBDIR/NetworkManager/$f
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 41760cb..69c17cc 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -365,7 +365,7 @@ boot/efi/EFI/redhat/grub.efi
 boot/efika.forth
 boot/memtest86*
 etc/NetworkManager/VPN
-etc/NetworkManager/nm-system-settings.conf
+etc/NetworkManager/NetworkManager.conf
 etc/NetworkManager/dispatcher.d
 etc/dbus-1/*
 etc/dbus-1/system.d/*
-- 
1.7.1.1

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