diff options
Diffstat (limited to 'source/n')
| -rw-r--r-- | source/n/NetworkManager/55NetworkManager | 39 | ||||
| -rwxr-xr-x | source/n/NetworkManager/NetworkManager.SlackBuild | 14 |
2 files changed, 7 insertions, 46 deletions
diff --git a/source/n/NetworkManager/55NetworkManager b/source/n/NetworkManager/55NetworkManager deleted file mode 100644 index d7b3ee6ae..000000000 --- a/source/n/NetworkManager/55NetworkManager +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# If we are running NetworkManager, tell it we are going to sleep. - -. "${PM_FUNCTIONS}" - -suspend_nm() -{ - # Tell NetworkManager to shut down networking - printf "Having NetworkManager put all interaces to sleep..." - dbus_send --system --print-reply \ - --dest=org.freedesktop.NetworkManager \ - /org/freedesktop/NetworkManager \ - org.freedesktop.NetworkManager.Sleep \ - boolean:true && \ - echo Done. || echo Failed. -} - -resume_nm() -{ - # Wake up NetworkManager and make it do a new connection - printf "Having NetworkManager wake interfaces back up..." - dbus_send --system --print-reply \ - --dest=org.freedesktop.NetworkManager \ - /org/freedesktop/NetworkManager \ - org.freedesktop.NetworkManager.Sleep \ - boolean:false && \ - echo Done. || echo Failed. -} - -case "$1" in - hibernate|suspend) - suspend_nm - ;; - thaw|resume) - resume_nm - ;; - *) exit $NA - ;; -esac diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild index 569597524..c826785b0 100755 --- a/source/n/NetworkManager/NetworkManager.SlackBuild +++ b/source/n/NetworkManager/NetworkManager.SlackBuild @@ -131,8 +131,9 @@ CXXFLAGS="$SLKCFLAGS" \ --with-nmtui=yes \ --enable-json-validation \ --enable-ovs \ - --with-session-tracking=consolekit \ - --with-suspend-resume=consolekit \ + --with-consolekit=no \ + --with-session-tracking=elogind \ + --with-suspend-resume=elogind \ --with-hostname-persist=slackware \ --build=$TARGET || exit 1 @@ -168,11 +169,10 @@ mkdir -p $PKG/etc/rc.d cat $CWD/rc.networkmanager > $PKG/etc/rc.d/rc.networkmanager.new chmod 0644 $PKG/etc/rc.d/rc.networkmanager.new -# Add the pm-utils hook back in -# xfce4-power-manager needs to be built *without* NM support -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pm-utils/sleep.d/ -cat $CWD/55NetworkManager > $PKG/usr/lib${LIBDIRSUFFIX}/pm-utils/sleep.d/55NetworkManager -chmod 0755 $PKG/usr/lib${LIBDIRSUFFIX}/pm-utils/sleep.d/55NetworkManager +# Move dbus configs to system location: +mkdir -p $PKG/usr/share/dbus-1/system.d/ +mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/ +rmdir --parents $PKG/etc/dbus-1/system.d/ # Add default (plain) config file to enable keyfile plugin cat $CWD/NetworkManager.conf > $PKG/etc/NetworkManager/NetworkManager.conf.new |