From 810bea627d425b2cf3fee592d8ac1045b5beb8b7 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 1 Feb 2008 20:30:11 +0000
Subject: add NetworkManager-dispatcher script to notify netreport apps
 (<linville@redhat.com>)

---
 Makefile                                 |  3 ++-
 NetworkManager/dispatcher.d/00-netreport | 11 +++++++++++
 initscripts.spec                         |  3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100755 NetworkManager/dispatcher.d/00-netreport

diff --git a/Makefile b/Makefile
index 408b0e05..e1f0af1a 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ install:
 	cp -af rc.d/init.d $(ROOT)/etc/rc.d/
 	install -m755 sysconfig/init sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/
 	cp -af sysconfig/network-scripts $(ROOT)/etc/sysconfig/
-	cp -af ppp udev $(ROOT)/etc
+	cp -af ppp udev Networkmanager $(ROOT)/etc
 	mkdir -p $(ROOT)/etc/ppp/peers
 	chmod 755 $(ROOT)/etc/rc.d/* $(ROOT)/etc/rc.d/init.d/*
 	chmod 755 $(ROOT)/etc/ppp/peers
@@ -53,6 +53,7 @@ install:
 	chmod 755 $(ROOT)/etc/sysconfig/network-scripts/ifdown-*
 	chmod 755 $(ROOT)/etc/sysconfig/network-scripts/init*
 	chmod 755 $(ROOT)/etc/sysconfig/network-scripts/net.hotplug
+	chmod 755 $(ROOT)/etc/NetworkManager/dispatcher.d/00-netreport
 	mkdir -p $(ROOT)/etc/sysconfig/modules
 	mkdir -p $(ROOT)/etc/sysconfig/networking/devices
 	mkdir -p $(ROOT)/etc/sysconfig/networking/profiles/default
diff --git a/NetworkManager/dispatcher.d/00-netreport b/NetworkManager/dispatcher.d/00-netreport
new file mode 100755
index 00000000..eee7fb38
--- /dev/null
+++ b/NetworkManager/dispatcher.d/00-netreport
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+cd /etc/sysconfig/network-scripts
+. ./network-functions
+
+[ -f ../network ] && . ../network
+
+# Notify programs that have requested notification
+do_netreport
+
+exit 0
diff --git a/initscripts.spec b/initscripts.spec
index 410fa6e1..9a84e41b 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -202,6 +202,9 @@ rm -rf $RPM_BUILD_ROOT
 %config /etc/ppp/ipv6-up
 %config /etc/ppp/ipv6-down
 %config /etc/initlog.conf
+%dir /etc/NetworkManager
+%dir /etc/NetworkManager/dispatcher.d
+/etc/NetworkManager/dispatcher.d/00-netreport
 %doc sysconfig.txt sysvinitfiles ChangeLog static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING
 /var/lib/stateless
 %ghost %attr(0600,root,utmp) /var/log/btmp
-- 
cgit v1.2.1