diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-08-06 19:56:46 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-08-07 08:59:46 +0200 |
commit | 8e64bd8dadd21e2f4d9780faf564f10ce65043fe (patch) | |
tree | 0335a0582f6bb96bd8e6df7c0c47613e81beb8b9 /testing/source/NetworkManager/doinst.sh | |
parent | 56f3f1d1b21085cbaa1191c111c1a99b80c84505 (diff) | |
download | current-8e64bd8dadd21e2f4d9780faf564f10ce65043fe.tar.gz |
Tue Aug 6 19:56:46 UTC 201920190806195646
a/mcelog-164-x86_64-1.txz: Upgraded.
a/os-prober-1.77-x86_64-3.txz: Rebuilt.
Fix cleanup() function. Thanks to USUARIONUEVO.
l/ffmpeg-4.2-x86_64-1.txz: Upgraded.
n/iw-5.3-x86_64-1.txz: Upgraded.
extra/pure-alsa-system/ffmpeg-4.2-x86_64-1_alsa.txz: Upgraded.
testing/packages/NetworkManager-1.20.0-x86_64-1.txz: Upgraded.
This finally drops libnm-glib. I'm curious to hear how this will affect
various NM plugins before merging it into the main tree. Please test and
report any problems.
Diffstat (limited to 'testing/source/NetworkManager/doinst.sh')
-rw-r--r-- | testing/source/NetworkManager/doinst.sh | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/testing/source/NetworkManager/doinst.sh b/testing/source/NetworkManager/doinst.sh new file mode 100644 index 00000000..6c88b8cf --- /dev/null +++ b/testing/source/NetworkManager/doinst.sh @@ -0,0 +1,42 @@ + +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname ${NEW})/$(basename ${NEW} .new)" + if [ -e ${OLD} ]; then + cp -a ${OLD} ${NEW}.incoming + cat ${NEW} > ${NEW}.incoming + mv ${NEW}.incoming ${NEW} + fi + mv ${NEW} ${OLD} +} + +if [ -e etc/HOSTNAME ]; then + sed -i "s,yourhostname,$(cat etc/HOSTNAME | cut -f1 -d .)," \ + etc/NetworkManager/NetworkManager.conf.new +fi + +# Preserve permissions, but move this into place. Otherwise the net +# connection could be lost at a remote location. +preserve_perms etc/rc.d/rc.networkmanager.new +config etc/NetworkManager/NetworkManager.conf.new +config etc/NetworkManager/conf.d/00-rc-manager.conf.new +config etc/NetworkManager/conf.d/00-dhcp-client.conf.new + +# If the .pid file is found in the old location, move it to the new one: +if [ -r var/run/NetworkManager.pid ]; then + mv var/run/NetworkManager.pid var/run/NetworkManager/NetworkManager.pid +fi + |