From 10def260f60aa5f23d2af7e03255900cffb0b724 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Sun, 19 Dec 2010 15:08:09 -0600 Subject: network/NetworkManager: Included a few minor fixes (read summary) This commit includes: 1. addition of "sleep 2" between stop() and start() in the restart() function of rc.networkmanager; it seems that a restart doesn't often work otherwise (perhaps something in NM is taking a bit longer to shutdown?) 2. use correct filename in /etc/NetworkManager/NetworkManager.conf Signed-off-by: Robby Workman --- network/NetworkManager/NetworkManager.SlackBuild | 3 ++- network/NetworkManager/NetworkManager.conf.new | 2 +- .../NetworkManager/patches/rc.networkmanager_restart.patch | 11 +++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 network/NetworkManager/patches/rc.networkmanager_restart.patch diff --git a/network/NetworkManager/NetworkManager.SlackBuild b/network/NetworkManager/NetworkManager.SlackBuild index 21d749096f..7e526d528e 100644 --- a/network/NetworkManager/NetworkManager.SlackBuild +++ b/network/NetworkManager/NetworkManager.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=NetworkManager VERSION=${VERSION:-0.8.2} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,6 +69,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/patches/rc.networkmanager_restart.patch patch -p1 < $CWD/patches/fix_crash_in_glib_with_time.patch patch -p1 < $CWD/patches/ignore_temp_files.patch diff --git a/network/NetworkManager/NetworkManager.conf.new b/network/NetworkManager/NetworkManager.conf.new index 9a57be16bd..71945e9076 100644 --- a/network/NetworkManager/NetworkManager.conf.new +++ b/network/NetworkManager/NetworkManager.conf.new @@ -1,4 +1,4 @@ -# /etc/NetworkManager/nm-system-settings.conf +# /etc/NetworkManager/NetworkManager.conf # # See NetworkManager.conf(5) for more information on this file diff --git a/network/NetworkManager/patches/rc.networkmanager_restart.patch b/network/NetworkManager/patches/rc.networkmanager_restart.patch new file mode 100644 index 0000000000..dc43fab86d --- /dev/null +++ b/network/NetworkManager/patches/rc.networkmanager_restart.patch @@ -0,0 +1,11 @@ +diff -Nur NetworkManager-0.8.2.orig//initscript/Slackware/rc.networkmanager NetworkManager-0.8.2/initscript/Slackware/rc.networkmanager +--- NetworkManager-0.8.2.orig//initscript/Slackware/rc.networkmanager 2010-11-03 15:11:32.000000000 -0500 ++++ NetworkManager-0.8.2/initscript/Slackware/rc.networkmanager 2010-12-18 15:41:06.884120091 -0600 +@@ -67,6 +67,7 @@ + nm_restart() + { + nm_stop ++ sleep 2 + nm_start + } + -- cgit v1.2.3